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

hansbak@svn.ofbiz.org hansbak at svn.ofbiz.org
Thu May 25 09:05:53 CDT 2006


Author: hansbak
Date: 2006-05-25 09:05:21 -0500 (Thu, 25 May 2006)
New Revision: 7674

Added:
   trunk/applications/content/widget/content/ContentForms.xml
   trunk/applications/content/widget/content/DataResourceForms.xml
Modified:
   trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
   trunk/applications/content/webapp/content/WEB-INF/controller.xml
   trunk/applications/content/widget/content/ContentScreens.xml
   trunk/applications/content/widget/content/DataResourceScreens.xml
Log:
enhancements to the dataresource screens, added status and make lookup screen work

Modified: trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
===================================================================
--- trunk/applications/content/src/org/ofbiz/content/data/DataServices.java	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/src/org/ofbiz/content/data/DataServices.java	2006-05-25 14:05:21 UTC (rev 7674)
@@ -33,6 +33,7 @@
 import java.io.Writer;
 import java.sql.Timestamp;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -40,6 +41,7 @@
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -127,6 +129,18 @@
             dataResource.put("lastModifiedByUserLogin", lastModifiedByUserLogin);
             dataResource.put("createdDate", createdDate);
             dataResource.put("lastModifiedDate", lastModifiedDate);
+            // get first statusId  for content out of the statusItem table if not provided 
+            if (UtilValidate.isEmpty(dataResource.get("statusId"))) {
+                try {
+                    List statusItems = delegator.findByAnd("StatusItem",UtilMisc.toMap("statusTypeId", "CONTENT_STATUS"), UtilMisc.toList("sequenceId"));
+                    if (!UtilValidate.isEmpty(statusItems)) {
+                        dataResource.put("statusId",  ((GenericValue) statusItems.get(0)).getString("statusId")); 
+                    }
+                } catch (GenericEntityException e) {
+                    return ServiceUtil.returnError(e.getMessage());
+                }
+            }
+            
             try {
                 dataResource.create();
             } catch (GenericEntityException e) {

Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml	2006-05-25 14:05:21 UTC (rev 7674)
@@ -740,22 +740,16 @@
         <response name="success" type="request" value="EditDataResource"/>
         <response name="error" type="view" value="EditDataResource"/>
     </request-map>
-    <request-map uri="UpdateDataResource">
+    <request-map uri="updateDataResource">
         <security auth="true" https="true"/>
         <event invoke="updateDataResource" path="" type="service"/>
         <response name="success" type="view" value="EditDataResource"/>
         <response name="error" type="view" value="EditDataResource"/>
     </request-map>
-    <request-map uri="updateDataResource">
-        <security auth="true" https="true"/>
-        <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="persistDataResource" />
-        <response name="success" type="request" value="EditDataResource"/>
-        <response name="error" type="view" value="EditDataResource"/>
-    </request-map>
     <request-map uri="createDataResource">
         <security auth="true" https="true"/>
         <event type="java" path="org.ofbiz.content.data.DataEvents" invoke="persistDataResource" />
-        <response name="success" type="request" value="EditDataResource"/>
+        <response name="success" type="view" value="EditDataResource"/>
         <response name="ELECTRONIC_TEXT" type="view" value="EditElectronicText"/>
         <response name="IMAGE_OBJECT" type="view" value="UploadImage"/>
         <response name="error" type="view" value="AddDataResource"/>
@@ -1686,7 +1680,7 @@
 
     <!-- lookup content component -->
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
-    <view-map name="LookupDataResource" page="component://content/widget/content/DataScreens.xml#LookupDataResource" type="screen"/>
+    <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/>
     <view-map name="LookupSurvey" page="component://content/widget/SurveyScreens.xml#LookupSurvey" type="screen"/>
     <view-map name="LookupSurveyResponse" page="component://content/widget/SurveyScreens.xml#LookupSurveyResponse" type="screen"/>
     <view-map name="LookupListLayout" page="/layout/LookupListLayout.ftl" type="jpublish"/>

Added: trunk/applications/content/widget/content/ContentForms.xml
===================================================================
--- trunk/applications/content/widget/content/ContentForms.xml	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/widget/content/ContentForms.xml	2006-05-25 14:05:21 UTC (rev 7674)
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Id: ContentForms.xml 7670 2006-05-25 06:26:46Z hansbak $
+    
+    Copyright 2001-2006 The Apache Software Foundation
+    
+    Licensed 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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../framework/widget/dtd/widget-form.xsd">
+    
+    <form name="FindContent" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="findContent" title="" type="single">
+        <!--auto-fields-entity entity-name="Content" default-field-type="find" /-->
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="contentId"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="contentName"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="description"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="contentTypeId" position="1">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+            </drop-down>
+        </field>
+        <field name="mimeTypeId" position="2">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="dataResourceId" position="1">
+            <lookup target-form-name="LookupDataResource"/>
+        </field>
+        <field name="ownerContentId" position="2">
+            <lookup target-form-name="LookupContent"/>
+        </field>
+        <field name="statusId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field>
+        <field name="localeString">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+            </drop-down>
+        </field>
+        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    <form name="ListContent" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="tabletext"
+        list-name="listIt" target="" paginate-target="findContent" title="" type="list">
+        <actions>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="Content"/>
+                <field-map field-name="orderBy" value="contentId"/>
+            </service>
+        </actions>
+        
+        <field name="contentId" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentId}" target="gotoContent?contentId=${contentId}"/>
+        </field>
+        <field name="contentName"><display/></field>
+        <field name="description"><display/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field>
+        <field name="localeString"><display-entity entity-name="CountryCode" key-field-name="countryCode" description="${countryName}[${countryCode}]"></display-entity></field>
+        <field name="contentTypeId"><display-entity entity-name="ContentType"></display-entity></field>
+        <field name="mimeTypeId"><display-entity entity-name="MimeType"></display-entity></field>
+        <field name="dataResourceId"><display/></field>
+        <field name="ownerContentId"><display/></field>
+        <field name="createdByUserLogin"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
+    </form>
+
+    <form name="LookupContent"  default-tooltip-style="tabletext" extends="FindContent"
+        target="LookupContent" title="" type="single">
+    </form>
+    <form name="ListLookupContent" extends="ListContent" paginate-target="LookupContent" default-widget-style="tabletext" 
+        type="list" list-name="listIt">
+        <actions>
+            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="Content"/>
+                <field-map field-name="orderBy" value="contentId"/>
+            </service>
+        </actions>
+        <field name="contentId">
+            <hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
+        </field> 
+        <field name="createdByUserLogin"><ignored/></field>
+    </form>
+    
+    <form name="EditContent" target="updateContent" title="" type="single"
+        default-title-style="tableheadtext" default-map-name="currentValue"
+        default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <actions>
+            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+                <field-map field-name="statusId" env-name="currentValue.statusId"/>
+            </entity-one>
+        </actions>
+        <alt-target use-when="currentValue==null" target="createContent"/>
+        <auto-fields-entity entity-name="Content" />
+        <field use-when="currentValue!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+        <field use-when="currentValue==null&amp;&amp;contentId==null" name="contentId"><ignored/></field>
+        <field use-when="currentValue==null&amp;&amp;contentId!=null" name="contentId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${contentId}]" also-hidden="false"/></field>
+        <field name="contentTypeId">
+            <drop-down allow-empty="false">
+                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+            </drop-down>
+        </field>
+        <field name="dataResourceId">
+            <lookup target-form-name="LookupDataResource">
+                <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+                <!--
+                    <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+                    <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+                -->
+            </lookup>
+        </field>
+        <field name="ownerContentId"><lookup target-form-name="LookupContent"/></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="statusId" use-when="currentValue==null"><ignored/></field>
+        <field name="statusId" use-when="currentValue!=null" widget-style="selectBox">
+                <drop-down allow-empty="false" current-description="${currentStatus.description}">
+                <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
+                    <entity-constraint name="statusId" value="${currentValue.statusId}"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="createdByUserLogin" position="1"><display/></field>
+        <field name="createdDate" position="2"><display/></field>
+        <field name="lastModifiedByUserLogin" position="1"><display/></field>
+        <field name="lastModifiedDate" position="2"><display/></field>
+        <field name="createButton" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="updateButton" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    <!--form name="AddContent" target="createContent" title="" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="Content" />
+        <field name="contentId"><text/></field>
+        <field name="dataResourceId" map-name="currentValue"><lookup target-form-name="LookupDataResource"/></field>
+        <field name="contentPurposeTypeId" entity-name="ContentPurposeType" map-name="dummy">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="contentTypeId">
+            <drop-down allow-empty="false">
+                <entity-options description="${description}" entity-name="ContentType" key-field-name="contentTypeId"/>
+            </drop-down>
+        </field>
+        <field name="ownerContentId" title=""><lookup target-form-name="LookupContent"/></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="statusId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS "/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="createdByUserLogin" position="1"><display/></field>
+        <field name="createdDate" position="2"><display/></field>
+        <field name="lastModifiedByUserLogin" position="1"><display/></field>
+        <field name="lastModifiedDate" position="2"><display/></field>
+    </form-->
+    
+    
+    <!-- Content Lookup forms -->
+    <form name="mruLookupContent" default-entity-name="Content"
+        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="${contentId}" target="javascript:set_value('${contentId}')"/>
+        </field>
+        <field name="contentName" title="Content Name" widget-style="buttontext"><display/></field>
+        <field name="description" title="Description" widget-style="buttontext"><display/></field>
+    </form>
+    <!-- ContentAssoc forms -->
+    <form name="EditContentAssoc" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="updateContentAssoc" title="" type="single">
+        <actions>
+            <entity-one entity-name="ContentAssoc" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+                <field-map env-name="contentIdTo" field-name="contentIdTo" />
+                <field-map env-name="contentAssocTypeId" field-name="contentAssocTypeId" />
+                <field-map env-name="fromDate" field-name="fromDate" />
+            </entity-one>
+        </actions>
+        <auto-fields-entity entity-name="ContentAssoc"/>
+        <field name="contentId" title="" widget-style="buttontext"><display/></field>
+        <field name="contentIdTo" title="" widget-style="buttontext"><display/></field>
+        <field name="contentAssocTypeId" title="" widget-style="buttontext"><display/></field>
+        <field name="fromDate" title="" widget-style="buttontext"><display/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="AddContentAssoc" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="createContentAssoc" title="" type="single">
+        <auto-fields-service service-name="createContentAssoc"/>
+        <field name="contentId" title="" widget-style="buttontext"><display description="${contentId}"/></field>
+        <field name="contentIdTo" title="" widget-style="buttontext" map-name="currentValue">
+            <lookup target-form-name="LookupContent"/>
+        </field>
+        <field name="contentAssocTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
+            </drop-down>
+        </field>
+        <field name="metaDataPredicateId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Create" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+        <field name="createdDate"><hidden/></field>
+        <field name="createdByUserLogin"><hidden/></field>
+        <field name="lastModifiedDate"><hidden/></field>
+        <field name="lastModifiedByUserLogin"><hidden/></field>
+    </form>
+    <form name="ListContentAssocFrom" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="" title="Assoc From this Content" type="list">
+        <actions>
+            <entity-and entity-name="ContentAssoc" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+            </entity-and>
+        </actions>
+        <auto-fields-entity entity-name="ContentAssoc" default-field-type="display"/>
+        <field name="contentId" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentId}" target="gotoContent?contentId=${contentId}"/>
+        </field>
+        <field name="contentIdTo" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentIdTo}" target="gotoContent?contentId=${contentIdTo}"/>
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Delete]" target="removeContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+        </field>
+        <field name="editLink" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Edit]" target="EditContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+        </field>
+    </form>
+    <form name="ListContentAssocTo" default-entity-name="Content"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="EditContentAssoc" title="Assoc To this Content" type="list">
+        <actions>
+            <entity-and entity-name="ContentAssoc" use-cache="true">
+                <field-map env-name="contentId" field-name="contentIdTo" />
+            </entity-and>
+        </actions>
+        <auto-fields-entity entity-name="ContentAssoc" default-field-type="display"/>
+        <field name="contentId" title="Content Id " widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentId}" target="gotoContent?contentId=${contentId}"/>
+        </field>
+        <field name="contentIdTo" title="Content Id To" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentIdTo}" target="gotoContent?contentId=${contentIdTo}"/>
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Delete]" target="removeContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+        </field>
+        <field name="editLink" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="[Edit]" target="EditContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+        </field>
+    </form>
+    
+    
+    <!-- ContentRole forms -->
+    <form name="AddContentRole" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addContentRole" title="" type="single">
+        <auto-fields-service service-name="createContentRole"/>
+        <field name="contentId" title="" widget-style="buttontext" > 
+            <lookup target-form-name="LookupContent" />
+        </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">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+    <form name="EditContentRole" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="Edit${contentRoleTarget}ContentRole" title="" type="single">
+        <auto-fields-service service-name="createContentRole"/>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListContentRole" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="update${contentRoleTarget}ContentRole" title="" type="list">
+        <actions>
+            <entity-and entity-name="ContentRole" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+            </entity-and>
+        </actions>
+        <auto-fields-service service-name="updateContentRole" default-field-type="display" />
+        <field name="thruDate" widget-style="buttontext"><date-time/></field>
+        <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="remove${contentRoleTarget}ContentRole?contentId=${contentId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}"/>
+        </field>
+    </form>
+    
+    <!-- ContentPurpose forms -->
+    <form name="AddContentPurpose" 
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addContentPurpose" title="" type="single">
+        <auto-fields-service service-name="createContentPurpose"/>
+        <field name="contentId" title="" widget-style="buttontext" ><lookup target-form-name="LookupContent"/></field>
+        <field name="contentPurposeTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="ContentPurposeType" key-field-name="contentPurposeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListContentPurpose" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="updateContentPurpose" title="" type="list">
+        <actions>
+            <entity-and entity-name="ContentPurpose" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+            </entity-and>
+        </actions>
+        <auto-fields-service service-name="updateContentPurpose" default-field-type="display" />
+        <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="removeContentPurpose?contentId=${contentId}&amp;contentPurposeTypeId=${contentPurposeTypeId}"/>
+        </field>
+    </form>
+    
+    <!-- ContentAttribute forms -->
+    <form name="AddContentAttribute" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addContentAttribute" title="" type="single">
+        <auto-fields-service service-name="createContentAttribute"/>
+        <field name="contentId" title="" widget-style="buttontext" > 
+            <lookup target-form-name="LookupContent" />
+        </field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
+        name="ListContentAttribute"
+        target="updateContentAttribute" title="" type="list">
+        <actions>
+            <entity-and entity-name="ContentAttribute" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+            </entity-and>
+        </actions>
+        <auto-fields-service service-name="updateContentAttribute" 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="removeContentAttribute?contentId=${contentId}&amp;attrName=${attrName}"/>
+        </field>
+    </form>
+    
+    <!-- ContentMetaData forms -->
+    <form name="AddContentMetaData" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="addContentMetaData" title="" type="single">
+        <auto-fields-service service-name="createContentMetaData"/>
+        <field name="contentId" title="" widget-style="buttontext" > 
+            <lookup target-form-name="LookupContent" />
+        </field>
+        <field name="metaDataPredicateId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="MetaDataPredicate" key-field-name="metaDataPredicateId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="Add" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    <form name="ListContentMetaData" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="updateContentMetaData" title="" type="list">
+        <actions>
+            <entity-and entity-name="ContentMetaData" use-cache="true">
+                <field-map env-name="contentId" field-name="contentId" />
+            </entity-and>
+        </actions>
+        <auto-fields-service service-name="updateContentMetaData" default-field-type="edit" />
+        <field name="contentId" title="ContentId" widget-style="buttontext"><display/></field>
+        <field name="metaDataPredicateId" title="MetaDataPredicateId" widget-style="buttontext"><display/></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="removeContentMetaData?contentId=${contentId}&amp;metaDataPredicateId=${metaDataPredicateId}"/>
+        </field>
+    </form>
+    
+    <!-- Person Lookup forms -->
+    <form name="mruLookupPerson"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display"
+        list-name="mruList" target="" title="" type="list">
+        <field name="partyId" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+        </field>
+        <field name="firstName" title="" widget-style="buttontext"> <display/> </field>
+        <field name="lastName" title="" widget-style="buttontext"> <display/> </field>
+    </form>
+    <form name="mruLookupPartyAndUserLoginAndPerson" 
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display"
+        list-name="mruList" target="" title="" type="list">
+        <field name="partyId" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}', '${userLoginId}')"/>
+        </field>
+        <field name="firstName" title="" widget-style="buttontext"> <display/> </field>
+        <field name="lastName" title="" widget-style="buttontext"> <display/> </field>
+    </form>
+</forms>


Property changes on: trunk/applications/content/widget/content/ContentForms.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/widget/content/ContentScreens.xml	2006-05-25 14:05:21 UTC (rev 7674)
@@ -27,18 +27,18 @@
             </condition>
             <actions>
                 <set field="headerItem" value="Content"/>
-                <set field="title" value="Content Find Page"/>
+                <set field="title" value="PageTitleFindContent"/>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
+                <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
             </actions>
             <widgets>
                 <decorator-screen name="mainContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
                         <label style="head1" text="${uiLabelMap.PageTitleFindContent}"/>
-                        <include-form name="FindContent" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/>
                         <label style="head1" text="Content List"></label>
-                        <include-form name="ListContent" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContent" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -59,7 +59,7 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditContent" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="EditContent" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -79,7 +79,7 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="AddContent" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="AddContent" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -107,9 +107,9 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListContentAssocFrom" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentAssocFrom" location="component://content/widget/content/ContentForms.xml"/>
                         <label style="head1" text="List associations 'to'"></label>
-                        <include-form name="ListContentAssocTo" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentAssocTo" location="component://content/widget/content/ContentForms.xml"/>
                         <section>
                             <condition>
                                 <and>
@@ -121,7 +121,7 @@
                             </condition>
                             <widgets>
                                 <label style="head1" text="Add an association"></label>
-                                <include-form name="EditContentAssoc" location="component://content/webapp/content/content/ContentForms.xml"/>
+                                <include-form name="EditContentAssoc" location="component://content/widget/content/ContentForms.xml"/>
                             </widgets>
                         </section>
                         <section>
@@ -135,7 +135,7 @@
                             </condition>
                             <widgets>
                                 <label style="head1" text="Add an association"></label>
-                                <include-form name="AddContentAssoc" location="component://content/webapp/content/content/ContentForms.xml"/>
+                                <include-form name="AddContentAssoc" location="component://content/widget/content/ContentForms.xml"/>
                             </widgets>
                         </section>
                     </decorator-section>
@@ -164,9 +164,9 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/>
                         <label style="head1" text="Add a Role"></label>
-                        <include-form name="AddContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -191,9 +191,9 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListContentPurpose" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
                         <label style="head1" text="Add a purpose"></label>
-                        <include-form name="AddContentPurpose" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -218,9 +218,9 @@
         <widgets>
             <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                 <decorator-section name="body">
-                    <include-form name="ListContentAttribute" location="component://content/webapp/content/content/ContentForms.xml"/>
+                    <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
                     <label style="head1" text="Add an attribute"></label>
-                    <include-form name="AddContentAttribute" location="component://content/webapp/content/content/ContentForms.xml"/>
+                    <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/>
                 </decorator-section>
             </decorator-screen>
         </widgets>
@@ -246,9 +246,9 @@
             <widgets>
                 <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ListContentMetaData" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
                         <label style="head1" text="Add a metadata"></label>
-                        <include-form name="AddContentMetaData" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -262,16 +262,14 @@
             </condition>
             <actions>
                 <set field="title" value="Lookup Content"/>
-                <set field="entityName" value="Content"/>
-                <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
             </actions>
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="LookupContent" location="component://content/webapp/content/content/ContentForms.xml"/>
-                        <include-form name="ListLookupContent" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="LookupContent" location="component://content/widget/content/ContentForms.xml"/>
+                        <include-form name="ListLookupContent" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Added: trunk/applications/content/widget/content/DataResourceForms.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceForms.xml	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/widget/content/DataResourceForms.xml	2006-05-25 14:05:21 UTC (rev 7674)
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Id: DataResourceForms.xml 7650 2006-05-21 13:06:02Z hansbak $
+    
+    Copyright 2001-2006 The Apache Software Foundation
+    
+    Licensed 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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../framework/widget/dtd/widget-form.xsd">
+    <!-- DataResource forms -->
+    <form name="FindDataResource" target="findDataResource" type="single"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="dataResourceId"><text-find default-option="contains" ignore-case="true"/></field>
+        <field name="dataResourceName"><text-find default-option="contains" ignore-case="true"/></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="mimeTypeId" position="2">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="statusId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" entity-name="StatusItem">
+                    <entity-constraint name="statusTypeId" operator="equals" value="CONTENT_STATUS"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="localeString" position="2">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"/>
+            </drop-down>
+        </field>
+        <field name="createdByUserLogin" position="1"><lookup target-form-name="LookupPerson"/></field>
+        <field name="dataCategoryId" position="2">
+            <drop-down allow-empty="true">
+                <entity-options description="${categoryName}" entity-name="DataCategory"/>
+            </drop-down>
+         </field>
+        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+    
+    <form name="ListDataResource" paginate-target="findDataResource" type="list" list-name="listIt"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
+        <actions>
+          <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+            <field-map field-name="inputFields" env-name="parameters"/>
+            <field-map field-name="entityName" value="DataResource"/>
+            <field-map field-name="orderBy" value="dataResourceId"/>
+          </service>
+        </actions>
+        <field name="dataResourceId" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${dataResourceId}" target="editDataResource?dataResourceId=${dataResourceId}"/>
+        </field>
+        <field name="dataResourceName"><display/></field>
+        <field name="dataResourceTypeId"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
+        <field name="mimeTypeId"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+        <field name="localeString"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
+        <field name="createdByUserLogin"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
+        <field name="dataCategoryId"><display-entity entity-name="DataCategory" description="${categoryName}[${datacategoryId}]"></display-entity></field>
+    </form>
+    
+    <form name="LookupDataResource" target="LookupDataResource" type="single" extends="FindDataResource"
+         default-tooltip-style="tabletext">
+    </form>
+    <form name="ListLookupDataResource" extends="ListDataResource" paginate-target="LookupDataResource" type="list" 
+        list-name="listIt" default-widget-style="tabletext">
+        <actions>
+            <service service-name="performFind" result-map-list-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="DataResource"/>
+                <field-map field-name="orderBy" value="dataResourceId"/>
+            </service>
+        </actions>
+        <field name="dataResourceId">
+            <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">
+        <actions>
+            <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
+                <field-map field-name="statusId" env-name="currentValue.statusId"/>
+            </entity-one>
+        </actions>
+        <alt-target use-when="currentValue==null" target="createDataResource"/>
+        <auto-fields-entity entity-name="DataResource" default-field-type="edit"/>
+        <field use-when="currentValue!=null" name="dataResourceId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+        <field use-when="currentValue==null&amp;&amp;dataResourceId==null" name="dataResourceId"><ignored/></field>
+        <field use-when="currentValue==null&amp;&amp;dataResourceId!=null" name="dataResourceId" widget-style="tabletext"><display description="${uiLabelMap.CommonCannotBeFound}: [${dataResourceId}]" also-hidden="false"/></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" use-when="currentValue==null"><ignored/></field>
+        <field name="statusId" use-when="currentValue!=null" widget-style="selectBox">
+            <drop-down allow-empty="false" current-description="${currentStatus.description}">
+                <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
+                    <entity-constraint name="statusId" value="${currentValue.statusId}"/>
+                    <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="createButton" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="updateButton" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></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"></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"><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"><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"><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-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="dataResourceId"><display/></field>
+        <field name="objectInfo" title="Image File Name"><display description="${currentValue.objectInfo}"/></field>
+        <field name="imageData" entity-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="buttontext" 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-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="buttontext" 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-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" widget-style="buttontext" map-name="currentValue"><display/></field>
+        <field name="productFeatureId" 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-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="buttontext"><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="buttontext" 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="buttontext" 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="buttontext"><display/></field>
+        <field name="textData" title="Text_" id-name="textData"><textarea rows="20" cols="120" visual-editor-enable="true"/></field>
+        <field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+</forms>


Property changes on: trunk/applications/content/widget/content/DataResourceForms.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Modified: trunk/applications/content/widget/content/DataResourceScreens.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceScreens.xml	2006-05-25 13:04:42 UTC (rev 7673)
+++ trunk/applications/content/widget/content/DataResourceScreens.xml	2006-05-25 14:05:21 UTC (rev 7674)
@@ -26,69 +26,90 @@
             <actions>
                 <set field="headerItem" value="DataResource"/>
                 <set field="titleProperty" value="PageTitleFindDataResource"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="30"/>
+                <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
             </actions>
             <widgets>
                 <decorator-screen name="mainContentDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container><link target="editDataResource" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
                         <label style="head1" text="${uiLabelMap.PageTitleFindDataResource}"/>
-                        <include-form name="FindDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
-                        <include-form name="ListDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+                        <include-form name="FindDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
+                        <label style="head1" text="Data Resource List"></label>
+                        <include-form name="ListDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <!--
-    <screen name="BrowseDataResource">
+    <screen name="LookupDataResource">
         <section>
             <condition>
                 <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
             </condition>
             <actions>
-                <set field="headerItem" value="DataResource"/>
-                <set field="currentMenuItemName" to-scope="user" value="browsedataresource"/>
+                <set field="title" value="Lookup Data Resource"/>
+                <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
             </actions>
             <widgets>
-                <decorator-screen name="common-decorator">
+                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
+                        <include-form name="LookupDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
+                        <include-form name="ListLookupDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    -->
-    <screen name="UploadImage">
+
+    <screen name="EditDataResource">
         <section>
             <condition>
                 <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
             </condition>
             <actions>
                 <set field="headerItem" value="DataResource"/>
-                <set field="tabButtonItem" value="uploadImage"/>
-                <entity-one entity-name="DataResource" value-name="currentValue">
-                    <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
-                </entity-one>
+                <set field="tabButtonItem" value="editDataResource"/>
+                <set field="dataResourceId" from-field="parameters.dataResourceId"/>
+                <entity-one entity-name="DataResource" value-name="currentValue"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="ImageUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+                        <include-form name="EditDataResource" location="component://content/widget/content/DataResourceForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <screen name="EditDataResource">
+    <!--
+    <screen name="BrowseDataResource">
         <section>
             <condition>
                 <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
             </condition>
             <actions>
                 <set field="headerItem" value="DataResource"/>
-                <set field="tabButtonItem" value="editDataResource"/>
+                <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="tabButtonItem" value="uploadImage"/>
                 <entity-one entity-name="DataResource" value-name="currentValue">
                     <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
                 </entity-one>
@@ -96,13 +117,13 @@
             <widgets>
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="EditDataResource" location="component://content/webapp/content/data/DataResourceForms.xml"/>
+                        <include-form name="ImageUpload" location="component://content/webapp/content/data/DataResourceForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <screen name="AddDataResource">
+    <!--screen name="AddDataResource">
         <section>
             <condition>
                 <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
@@ -119,7 +140,7 @@
                 </decorator-screen>
             </widgets>
         </section>
-    </screen>
+    </screen-->
     <screen name="AddDataResourceText">
         <section>
             <condition>



More information about the Svn mailing list