[OFBiz] SVN: r7085 - in trunk/applications/content: src/org/ofbiz/content/data webapp/content/WEB-INF webapp/content/includes widget widget/contentsetup widget/data

byersa@svn.ofbiz.org byersa at svn.ofbiz.org
Mon Mar 27 08:50:45 CST 2006


Author: byersa
Date: 2006-03-27 08:50:35 -0600 (Mon, 27 Mar 2006)
New Revision: 7085

Added:
   trunk/applications/content/widget/contentsetup/ContentSetupMenus.xml
   trunk/applications/content/widget/data/DataResourceForms.xml
   trunk/applications/content/widget/data/DataResourceMenus.xml
   trunk/applications/content/widget/data/DataResourceScreens.xml
Modified:
   trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
   trunk/applications/content/webapp/content/WEB-INF/controller.xml
   trunk/applications/content/webapp/content/includes/appheader.ftl
   trunk/applications/content/widget/CommonScreens.xml
   trunk/applications/content/widget/ContentMenus.xml
Log:
Some new screens to make image uploading work better in Content.


Modified: trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
===================================================================
--- trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java	2006-03-27 14:50:35 UTC (rev 7085)
@@ -192,6 +192,7 @@
      * Uploads image data from a form and stores it in ImageDataResource. Expects key data in a field identitified by the "idField" value and the binary data
      * to be in a field id'd by uploadField.
      */
+    // TODO: This method is not used and should be removed. amb
     public static String uploadAndStoreImage(HttpServletRequest request, String idField, String uploadField) {
         //GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
 

Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -562,7 +562,6 @@
 
     <!-- ================ Redirect Content Requests ================= -->
     <request-map uri="ContentMenu"><security auth="true" https="true"/><response name="success" type="view" value="ContentMenu"/></request-map>
-    <request-map uri="DataMenu"><security auth="true" https="true"/><response name="success" type="view" value="DataMenu"/></request-map>
     <request-map uri="ContentSetupMenu"><security auth="true" https="true"/><response name="success" type="view" value="ContentSetupMenu"/></request-map>
     <request-map uri="DataSetupMenu"><security auth="true" https="true"/><response name="success" type="view" value="DataSetupMenu"/></request-map>
     <request-map uri="LayoutMenu"><security auth="true" https="true"/><response name="success" type="view" value="LayoutMenu"/></request-map>
@@ -668,7 +667,10 @@
     <request-map uri="EditDataResourceUpload"><security auth="true" https="true"/><response name="success" type="view" value="EditDataResourceUpload"/></request-map>
     <request-map uri="uploadImage">
         <security auth="true" https="true"/>
+		<!--
         <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="uploadImage" />
+			-->
+        <event invoke="persistContentAndAssoc" path="" type="service"/>
         <response name="success" type="request" value="UploadImage"/>
         <response name="error" type="view" value="UploadImage"/>
     </request-map>
@@ -1446,22 +1448,21 @@
     <view-map name="EditContentOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation" type="screen"/>
     <view-map name="EditContentPurposeOperation"  page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation" type="screen"/>
 
-    <view-map name="FindDataResource"  page="component://content/widget/content/DataResourceScreens.xml#FindDataResource" type="screen"/>
-    <view-map name="UploadImage"  page="component://content/widget/content/DataResourceScreens.xml#UploadImage" type="screen"/>
-    <view-map name="EditDataResource"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResource" type="screen"/>
-    <view-map name="AddDataResource"  page="component://content/widget/content/DataResourceScreens.xml#AddDataResource" type="screen"/>
-    <view-map name="AddDataResourceText"  page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceText" type="screen"/>
-    <view-map name="AddDataResourceUrl"  page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/>
-    <view-map name="AddDataResourceUpload"  page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/>
-    <view-map name="EditDataResourceText"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceText" type="screen"/>
-    <view-map name="EditDataResourceUrl"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/>
-    <view-map name="EditDataResourceUpload"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/>
-    <view-map name="EditElectronicText"  page="component://content/widget/content/DataResourceScreens.xml#EditElectronicText" type="screen"/>
-    <view-map name="EditDataResourceAttribute"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceAttribute" type="screen"/>
-    <view-map name="EditDataResourceRole"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceRole" type="screen"/>
-    <view-map name="EditDataResourceProductFeatures"  page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceProductFeatures" type="screen"/>
-    <view-map name="EditHtmlText"  page="component://content/widget/content/DataResourceScreens.xml#EditHtmlText" type="screen"/>
-    <view-map name="DataMenu"  page="component://content/widget/content/DataResourceScreens.xml#DataMenu" type="screen"/>
+    <view-map name="FindDataResource"  page="component://content/widget/data/DataResourceScreens.xml#FindDataResource" type="screen"/>
+    <view-map name="UploadImage"  page="component://content/widget/data/DataResourceScreens.xml#UploadImage" type="screen"/>
+    <view-map name="EditDataResource"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResource" type="screen"/>
+    <view-map name="AddDataResource"  page="component://content/widget/data/DataResourceScreens.xml#AddDataResource" type="screen"/>
+    <view-map name="AddDataResourceText"  page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceText" type="screen"/>
+    <view-map name="AddDataResourceUrl"  page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/>
+    <view-map name="AddDataResourceUpload"  page="component://content/widget/data/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/>
+    <view-map name="EditDataResourceText"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceText" type="screen"/>
+    <view-map name="EditDataResourceUrl"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/>
+    <view-map name="EditDataResourceUpload"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/>
+    <view-map name="EditElectronicText"  page="component://content/widget/data/DataResourceScreens.xml#EditElectronicText" type="screen"/>
+    <view-map name="EditDataResourceAttribute"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceAttribute" type="screen"/>
+    <view-map name="EditDataResourceRole"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceRole" type="screen"/>
+    <view-map name="EditDataResourceProductFeatures"  page="component://content/widget/data/DataResourceScreens.xml#EditDataResourceProductFeatures" type="screen"/>
+    <view-map name="EditHtmlText"  page="component://content/widget/data/DataResourceScreens.xml#EditHtmlText" type="screen"/>
 
     <view-map name="BrowseDataResource" page="/data/BrowseDataResource.ftl" type="jpublish"/>
  

Modified: trunk/applications/content/webapp/content/includes/appheader.ftl
===================================================================
--- trunk/applications/content/webapp/content/includes/appheader.ftl	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/webapp/content/includes/appheader.ftl	2006-03-27 14:50:35 UTC (rev 7085)
@@ -35,7 +35,7 @@
   <div class="col"><a href="<@ofbizUrl>FindWebSite</@ofbizUrl>" class="${selectedLeftClassMap.WebSite?default(unselectedLeftClassName)}">WebSites</a></div>
   <div class="col"><a href="<@ofbizUrl>FindSurvey</@ofbizUrl>" class="${selectedLeftClassMap.Survey?default(unselectedLeftClassName)}">Surveys</a></div>
   <div class="col"><a href="<@ofbizUrl>ContentMenu</@ofbizUrl>" class="${selectedLeftClassMap.Content?default(unselectedLeftClassName)}">Content</a></div>
-  <div class="col"><a href="<@ofbizUrl>DataMenu</@ofbizUrl>" class="${selectedLeftClassMap.DataResource?default(unselectedLeftClassName)}">DataResource</a></div>
+  <div class="col"><a href="<@ofbizUrl>FindDataResource</@ofbizUrl>" class="${selectedLeftClassMap.DataResource?default(unselectedLeftClassName)}">DataResource</a></div>
 
   <div class="col"><a href="<@ofbizUrl>ContentSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.ContentSetupMenu?default(unselectedLeftClassName)}">Content Setup</a></div>
   <div class="col"><a href="<@ofbizUrl>DataSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.DataResourceSetupMenu?default(unselectedLeftClassName)}">DataResource Setup</a></div>

Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/CommonScreens.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -81,6 +81,23 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="commonDataResourceDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentContentMenuItemName" from-field="currentContentMenuItemName" from-scope="user"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="mainContentDecorator">
+                    <decorator-section name="body">
+                        <include-menu name="dataresource" location="component://content/webapp/content/data/DataResourceMenus.xml"/>
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     
     <screen name="commonCompDocDecorator">
         <section>

Modified: trunk/applications/content/widget/ContentMenus.xml
===================================================================
--- trunk/applications/content/widget/ContentMenus.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/ContentMenus.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -32,7 +32,7 @@
         <menu-item name="websites" title="${uiLabelMap.ContentWebSites}"><link target="FindWebSite"/></menu-item>
         <menu-item name="survey" title="${uiLabelMap.ContentSurvey}"><link target="FindSurvey"/></menu-item>
         <menu-item name="Content" title="${uiLabelMap.ContentContent}"><link target="ContentMenu"/></menu-item>
-        <menu-item name="DataResource" title="${uiLabelMap.ContentDataResource}"><link target="DataMenu"/></menu-item>
+        <menu-item name="DataResource" title="${uiLabelMap.ContentDataResource}"><link target="FindDataResource"/></menu-item>
         <menu-item name="ContentSetupMenu" title="${uiLabelMap.ContentContentSetup}"><link target="ContentSetupMenu"/></menu-item>
         <menu-item name="DataResourceSetupMenu" title="${uiLabelMap.ContentDataSetup}"><link target="DataSetupMenu"/></menu-item>
         <menu-item name="Layout" title="${uiLabelMap.ContentTemplate}"><link target="LayoutMenu"/></menu-item>

Added: trunk/applications/content/widget/contentsetup/ContentSetupMenus.xml
===================================================================
--- trunk/applications/content/widget/contentsetup/ContentSetupMenus.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/contentsetup/ContentSetupMenus.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
+    <menu name="contentsetup" default-title-style="tabButton"
+        default-selected-style="tabButtonSelected"
+        default-menu-item-name="content"
+        orientation="horizontal"
+        menu-width="100%"
+        default-tooltip-style="tabletext" default-widget-style="tabButton"
+        default-associated-content-id="${userLogin.userLoginId}"
+        title="" type="simple">
+
+        <menu-item name="adddataresource" title="Add" >
+            <link target="AddDataResource" name="AddDataResource" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="finddataresource" title="Find" >
+            <link target="FindDataResource" name="FindDataResource" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="browsedataresource" title="Browse" >
+            <link target="BrowseDataResource" name="BrowseDataResource" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresource" title="Data Resource" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="EditDataResource" name="EditDataResource" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editelectronictext" title="Text" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="EditElectronicText" name="EditElectronicText" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="edithtmltext" title="Html" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="EditHtmlText" name="EditHtmlText" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="uploadimage" title="Image" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="UploadImage" name="UploadImage" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourceattribute" title="Attribute" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="EditDataResourceAttribute" name="EditDataResourceAttribute" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourcerole" title="Role" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId"/></not>
+            </condition>
+            <link target="EditDataResourceRole" name="EditDataResourceRole" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourceproductfeatures" title="Product Features" >
+            <condition disabled-style="buttontextdisabled">
+                <not><if-empty field-name="dataResourceId" /></not>
+            </condition>
+            <link target="EditDataResourceProductFeatures" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" />
+        </menu-item>
+    </menu>
+</menus>

Added: trunk/applications/content/widget/data/DataResourceForms.xml
===================================================================
--- trunk/applications/content/widget/data/DataResourceForms.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/data/DataResourceForms.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ *  Copyright (c) 2003-2006 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <!-- DataResourceType forms -->
+    <form name="findDataResource" default-entity-name="DataResource" target="FindDataResource" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="DataResource" default-field-type="find"/>
+        <field name="dataResourceTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+            </drop-down>
+        </field>
+        <field name="mimeTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="characterSetId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="listFindDataResource" list-name="entityList" paginate-target="FindDataResource" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+        <actions>
+          <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+            <field-map field-name="inputFields" env-name="parameters"/>
+            <field-map field-name="entityName" env-name="entityName" value="DataResource"/>
+          </service>
+        </actions>
+        <auto-fields-entity entity-name="DataResource" default-field-type="display"/>
+        <field name="dataResourceId" title=" " widget-style="tabletext">
+            <hyperlink also-hidden="false" description="${dataResourceId}" target="gotoDataResource?dataResourceId=${dataResourceId}"/>
+        </field>
+    </form>
+    <form name="lookupDataResource" target="LookupDataResource" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="DataResource" default-field-type="find"/>
+        <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="listLookupDataResource" paginate-target="LookupDataResource" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+        <actions>
+            <service service-name="performFind" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" env-name="entityName"/>
+            </service>
+        </actions>
+        <auto-fields-entity entity-name="DataResource" default-field-type="display"/>
+        <field name="dataResourceId" title=" " widget-style="tabletext">
+            <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+        </field>
+    </form>
+    <form name="mruLookupDataResource" default-entity-name="DataResource" list-name="mruList" target="" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+        <field name="contentId" title="Id" widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${dataResourceId}" target="javascript:set_value('${dataResourceId}')"/>
+        </field>
+        <field name="dataResourceName" title="Name" widget-style="buttontext"><display/></field>
+        <field name="dataCategoryId" title="Category" widget-style="buttontext"><display/></field>
+    </form>
+    <form name="EditDataResource" target="UpdateDataResource" title="" type="single" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox" extends="DataResourceMaster">
+        <actions>
+            <service service-name="performFind" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" env-name="entityName" value="DataResource"/>
+            </service>
+        </actions>
+        <field name="dataResourceId" widget-style="tabletext"><display/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="createContent" title=" " widget-style="buttontext" position="2">
+            <hyperlink also-hidden="false" description="Create New Content" target="AddContent?dataResourceId=${currentValue.dataResourceId}"/>
+        </field>
+        <field name="mode"><hidden value="UPDATE"/></field>
+    </form>
+    <form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="DataResource" default-field-type="edit"/>
+        <field name="dataResourceId" widget-style="tabletext"></field>
+        <field name="dataResourceTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="DataResourceType" key-field-name="dataResourceTypeId"/>
+            </drop-down>
+        </field>
+        <field name="dataTemplateTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="DataTemplateType" key-field-name="dataTemplateTypeId"/>
+            </drop-down>
+        </field>
+        <field name="statusId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
+                    <entity-constraint name="statusTypeId" value="CONTENT_STATUS"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="dataCategoryId">
+            <drop-down allow-empty="true">
+                <list-options list-name="dataCategoryList"  key-name="dataCategoryId"  description="${categoryName}"/>
+            </drop-down>
+        </field>
+        <field name="mimeTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${mimeTypeId} - ${description}" entity-name="MimeType" key-field-name="mimeTypeId">
+                    <entity-order-by field-name="mimeTypeId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="characterSetId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="CharacterSet" key-field-name="characterSetId"/>
+            </drop-down>
+        </field>
+        <field name="createdDate"><display/></field>
+        <field name="lastModifiedDate"><display/></field>
+        <field name="createdByUserLogin"><display/></field>
+        <field name="lastModifiedByUserLogin"><display/></field>
+    </form>
+<!--
+     use-when="(dataResource != void) &amp;&amp; (dataResource.dataResourceId != void) &amp;&amp; (dataResource.dataResourceId.length()>0)" 
+-->
+    <form name="AddDataResource" target="createDataResource" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId"><text/></field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="objectInfo" title="URL"/>
+        <field name="mode"><hidden value="CREATE"/></field>
+    </form>
+    <form 
+        name="AddDataResourceText" target="createDataResourceAndText" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId"><text/></field>
+        <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
+        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+            <display description="ELECTRONIC_TEXT" also-hidden="false"/>
+        </field>
+        <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="120"/></field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="AddDataResourceUrl" target="createDataResourceUrl" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId"><text/></field>
+        <field name="objectInfo" title="URL"><text/></field>
+        <field name="dataResourceTypeId"><hidden value="URL_RESOURCE"/></field>
+        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+            <display description="URL_RESOURCE" also-hidden="false"/>
+        </field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="AddDataResourceUpload" target="createDataResourceUpload" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId" widget-style="tabletext"><display description="${dataResource.dataResourceId}"/></field>
+        <field name="dataResourceTypeId"><hidden value="IMAGE_OBJECT"/></field>
+        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+            <display description="IMAGE_OBJECT" also-hidden="false"/>
+        </field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="objectInfo" title="Uploaded File"><display/></field>
+    </form>
+    <form name="EditDataResourceText" target="updateDataResourceText" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId" widget-style="tabletext"><display/></field>
+        <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
+        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+            <display description="ELECTRONIC_TEXT" also-hidden="false"/>
+        </field>
+        <field name="textData" title="Text" id-name="textData"><textarea rows="20" cols="120"/> </field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="EditDataResourceUpload" target="updateDataResourceUpload" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="DataResourceMaster">
+        <field name="dataResourceId" widget-style="tabletext"><display /></field>
+        <field name="dataResourceTypeId"><hidden value="IMAGE_OBJECT"/></field>
+        <field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
+            <display description="IMAGE_OBJECT" also-hidden="false"/>
+        </field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="objectInfo" title="Uploaded File"><display/></field>
+    </form>
+    <form name="EditDataResourceUrl" target="updateDataResourceUrl" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        extends="AddDataResourceUrl">
+        <field name="objectInfo" title="URL"><text/></field>
+    </form>
+    <form name="ImageUpload" target="uploadImage" title="" type="upload"
+		default-map-name="dataResource"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="dataResourceId" widget-style="tabletext"><display/></field>
+        <field name="dataResourceTypeId">
+			<drop-down allow-empty="false" no-current-selected-key="IMAGE_OBJECT">
+				<option key="IMAGE_OBJECT" description="Image"/>
+				<option key="LOCAL_FILE_BIN" description="Local File"/>
+				<option key="OFBIZ_FILE_BIN" description="OFBiz File"/>
+				<option key="CONTEXT_FILE_BIN" description="Webapp File"/>
+			</drop-down>
+		</field>
+        <field name="objectInfo" title="Image File Name"><display/></field>
+        <field name="imageData" map-name="ImageDataResource"><file/></field>
+        <field name="submitButton" title="Upload" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <!-- DataResourceAttribute forms -->
+    <form name="AddDataResourceAttribute" 
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addDataResourceAttribute" title="" type="single">
+        <auto-fields-service service-name="createDataResourceAttribute"/>
+        <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListDataResourceAttribute"
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        list-name="contentList" 
+        target="updateDataResourceAttribute" title="" type="list">
+        <actions>
+            <service service-name="performFind" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" env-name="entityName" value="DataResourceAttribute"/>
+            </service>
+        </actions>
+        <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/>
+        <field name="attrValue" widget-style="buttontext"><text/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceAttribute?dataResourceId=${dataResourceId}&amp;attrName=${attrName}"/>
+        </field>
+    </form>
+
+    <!-- DataResourceRole forms -->
+    <form name="AddDataResourceRole" 
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addDataResourceRole" title="" type="single">
+        <auto-fields-entity entity-name="DataResourceRole"/>
+        <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field>
+        <field name="partyId" title="" widget-style="buttontext"><lookup target-form-name="LookupPerson"/></field>
+        <field name="roleTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListDataResourceRole" list-name="contentList" target="updateDataResourceRole" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <actions>
+            <service service-name="performFind" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" env-name="entityName" value="DataResourceAttribute"/>
+            </service>
+        </actions>
+        <auto-fields-service service-name="updateDataResourceRole" default-field-type="display"/>
+        <field name="thruDate" widget-style="buttontext"><date-time/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceRole?dataResourceId=${dataResourceId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}"/>
+        </field>
+    </form>
+
+    <!-- DataResourceProductFeature forms -->
+    <form name="AddDataResourceProductFeature" target="createDataResourceProductFeature" title="" type="single" 
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-service service-name="createProductFeatureDataResource"/>
+        <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field>
+        <field name="productFeatureId" title="" widget-style="buttontext"><lookup target-form-name="LookupProductFeature"/></field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListDataResourceProductFeature" list-name="contentList" target="" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <actions>
+            <service service-name="performFind" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" env-name="entityName" value="ProductFeature"/>
+            </service>
+        </actions>
+        <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>
+        <field name="dataResourceId"><hidden/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Delete]" target="removeDataResourceProductFeature?dataResourceId=${dataResourceId}&amp;productFeatureId=${productFeatureId}"/>
+        </field>
+    </form>
+    <form name="lookupProductFeature" target="LookupProductFeature" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="ProductFeature" default-field-type="find"/>
+        <field name="productFeatureTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ProductFeatureType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="productFeatureCategoryId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ProductFeatureCategory">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="listLookupProductFeature" list-name="entityList" paginate-target="LookupProductFeature" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+        <auto-fields-entity entity-name="ProductFeature" default-field-type="display"/>
+        <field name="productFeatureId" title=" " widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+        </field>
+    </form>
+    <form name="mruLookupProductFeature" default-entity-name="ProductFeature"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display"
+        list-name="mruList" target="" title="" type="list">
+        <field name="contentId" title="Id" widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
+        </field>
+        <field name="description" title="Name" widget-style="buttontext"><display/></field>
+        <field name="productFeatureTypeId" title="Type" widget-style="buttontext"><display/></field>
+    </form>
+
+    <!-- ElectronicText forms -->
+    <form name="EditElectronicText" target="updateElectronicText" title="" type="single" default-map-name="currentValue"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-service service-name="updateElectronicText"/>
+        <actions>
+            <entity-one entity-name="ElectronicText" value-name="eText">
+                <field-map field-name="dataResourceId" env-name="parameters.dataResourceId" ></field-map>
+            </entity-one>
+        </actions>
+        <field name="dataResourceId" title="" widget-style="tabletext"><display also-hidden="true"/></field>
+        <field name="textData" title="Text" widget-style="buttontext">
+            <textarea cols="120" rows="24" default-value="${eText.textData}" />
+        </field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="AddElectronicText" target="addElectronicText" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-service service-name="createElectronicText"/>
+        <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display also-hidden="true"/></field>
+        <field name="textData" title="" widget-style="buttontext"><textarea cols="120" rows="24"/></field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+
+    <!-- Html forms -->
+    <form name="AddHtmlText" target="addHtmlText" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="ElectronicText"/>
+        <field name="dataResourceId" title="" widget-style="tabletext" map-name="currentValue"><display/></field>
+        <field name="textData" title="Text" id-name="textData"><textarea rows="24" cols="120"/></field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="EditHtmlText" target="updateHtmlText" title="" type="single" default-map-name="currentValue"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="ElectronicText"/>
+        <field name="dataResourceId" title="" widget-style="tabletext"><display/></field>
+        <field name="textData" title="Text_" id-name="textData"><textarea rows="20" cols="120"/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+</forms>

Added: trunk/applications/content/widget/data/DataResourceMenus.xml
===================================================================
--- trunk/applications/content/widget/data/DataResourceMenus.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/data/DataResourceMenus.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
+    <menu name="dataresource" default-title-style="tabButton"
+        default-selected-style="tabButtonSelected"
+        default-menu-item-name="content"
+        orientation="horizontal"
+        menu-width="100%"
+        default-tooltip-style="tabletext" default-widget-style="tabButton"
+        default-associated-content-id="${userLogin.userLoginId}"
+		selected-menuitem-context-field-name="currentMenuItemName"
+        title="" type="simple">
+
+        <menu-item name="editdataresource" title="Data Resource" >
+            <link target="EditDataResource?dataResourceId=${dataResourceId}" name="EditDataResource" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editelectronictext" title="Text" >
+            <link target="EditElectronicText?dataResourceId=${dataResourceId}" name="EditElectronicText" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="edithtmltext" title="Html" >
+            <link target="EditHtmlText?dataResourceId=${dataResourceId}" name="EditHtmlText" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="uploadimage" title="Image" >
+            <link target="UploadImage?dataResourceId=${dataResourceId}" name="UploadImage" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourceattribute" title="Attribute" >
+            <link target="EditDataResourceAttribute?dataResourceId=${dataResourceId}" name="EditDataResourceAttribute" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourcerole" title="Role" >
+            <link target="EditDataResourceRole?dataResourceId=${dataResourceId}" name="EditDataResourceRole" target-window="_top" style="tabButton" />
+        </menu-item>
+        <menu-item name="editdataresourceproductfeatures" title="Product Features" >
+            <link target="EditDataResourceProductFeatures?dataResourceId=${dataResourceId}" name="EditDataResourceProductFeatures" target-window="_top" style="tabButton" />
+        </menu-item>
+	</menu>
+	
+    <menu name="empty" default-title-style="tabButton"
+        default-selected-style="tabButtonSelected"
+        default-menu-item-name="content"
+        orientation="horizontal"
+        menu-width="100%"
+        default-tooltip-style="tabletext" default-widget-style="tabButton"
+        default-associated-content-id="${userLogin.userLoginId}"
+        title="" type="simple">
+    </menu>
+</menus>

Added: trunk/applications/content/widget/data/DataResourceScreens.xml
===================================================================
--- trunk/applications/content/widget/data/DataResourceScreens.xml	2006-03-27 14:23:17 UTC (rev 7084)
+++ trunk/applications/content/widget/data/DataResourceScreens.xml	2006-03-27 14:50:35 UTC (rev 7085)
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ *  Copyright (c) 2005-2005 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  $Id: ContentSetupScreens.xml 5661 2005-09-07 20:40:17Z jonesde $
+-->
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+    <screen name="common-decorator">
+        <section>
+            <actions>
+                <set field="currentMenuItemName" from-field="currentMenuItemName"/>
+				<set field="menuName" from-field="menuName" default-value="dataresource"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+						<container>
+							<label style="head1" text="${title}"/>
+						</container>
+                        <include-menu name="${menuName}" location="component://content/widget/data/DataResourceMenus.xml"/>
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="FindDataResource">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="menuName" value="empty"/>
+                <set field="title" value="Find Data Resource"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+						<container><link target="AddDataResource" text="Add DataResource" style="buttontext"/></container>
+                        <include-form name="findDataResource" location="component://content/widget/data/DataResourceForms.xml"/>
+                        <include-form name="listFindDataResource" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <!--
+    <screen name="BrowseDataResource">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="browsedataresource"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    -->
+    <screen name="UploadImage">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="uploadimage"/>
+                <set field="menuName" value="dataresource"/>
+                <set field="title" value="Upload Image, dataResourceId: ${parameters.dataResourceId}"/>
+                <set field="currentMenuItemName" value="uploadimage"/>
+				<entity-one entity-name="DataResource" value-name="dataResource" />
+				<set field="dataResourceId" from-field="dataResource.dataResourceId" default-value="${parameters.dataResourceId}"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="ImageUpload" location="component://content/widget/data/DataResourceForms.xml"/>
+						<label text="View Image" style="head1"/>
+						<content dataresource-id="${dataResource.dataResourceId}"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResource">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresource"/>
+                
+                <set field="dataResourceId" from-field="parameters.dataResourceId" to-scope="screen" default-value="${defaultContentId}"/>
+                <set field="dataResourceId" from-field="dataResourceId" to-scope="user"/>
+                <entity-one entity-name="DataResource" value-name="currentValue">
+                    <field-map field-name="dataResourceId" env-name="dataResourceId"/>
+                </entity-one>
+                <set field="menuName" value="dataresource"/>
+                <set field="title" value="Edit Data Resource: ${dataResourceId}"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresource"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditDataResource" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="AddDataResource">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="menuName" value="empty"/>
+                <set field="title" value="Add Data Resource"/>
+                <set field="currentMenuItemName" to-scope="user" value="adddataresource"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResource" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="AddDataResourceText">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="adddataresourcetext"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceText" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="AddDataResourceUrl">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="adddataresourceurl"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceUrl" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                    
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="AddDataResourceUpload">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="adddataresourceupload"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceUpload" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceText">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourcetext"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditDataResourceText" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceUrl">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourceurl"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditDataResourceUrl" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceUpload">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourceupload"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditDataResourceUpload" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditElectronicText">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editelectronictext"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditElectronicText" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceAttribute">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourceattribute"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceAttribute" location="component://content/widget/data/DataResourceForms.xml"/>
+                        <include-form name="ListDataResourceAttribute" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceRole">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourcerole"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceRole" location="component://content/widget/data/DataResourceForms.xml"/>
+                        <include-form name="ListDataResourceRole" location="component://content/widget/data/DataResourceForms.xml"/>
+                        
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditDataResourceProductFeatures">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="editdataresourceproductfeatures"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="AddDataResourceProductFeature" location="component://content/widget/data/DataResourceForms.xml"/>
+                        <include-form name="ListDataResourceProductFeature" location="component://content/widget/data/DataResourceForms.xml"/>
+                        
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditHtmlText">
+        <section>
+            <condition>
+                <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+            </condition>
+            <actions>
+                <set field="headerItem" value="DataResource"/>
+                <set field="currentMenuItemName" to-scope="user" value="edithtmltext"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="common-decorator">
+                    <decorator-section name="body">
+                        <include-form name="EditHtmlText" location="component://content/widget/data/DataResourceForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>



More information about the Svn mailing list