svn commit: r479016 - in /incubator/ofbiz/trunk/applications/content: webapp/content/WEB-INF/controller.xml webapp/content/layout/LayoutForms.xml webapp/content/lookup/LookupForms.xml widget/LookupScreens.xml

[jacopoc]

Author: jacopoc
Date: Fri Nov 24 13:59:51 2006
New Revision: 479016

URL: http://svn.apache.org/viewvc?view=rev&rev=479016
Log:
Another JPublish page migrated to the widget: the new screen is not fully working as is now, but probably the same was true for the old one.
If someone with deeper knowledge than me about the content stuff is reading this and wants to help to improve this, that would be great.

Modified:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
    incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=479016&r1=479015&r2=479016
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri Nov 24 13:59:51 2006
@@ -1668,7 +1668,7 @@
     <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="component://content/widget/LookupScreens.xml#LookupListLayout" type="screen"/>
-    <view-map name="LookupSubContent" page="/layout/LookupSubContent.ftl" type="jpublish"/>
+    <view-map name="LookupSubContent" page="component://content/widget/LookupScreens.xml#LookupSubContent" type="screen"/>
     <!-- lookup other components -->
     <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/>
     <view-map name="LookupPartyAndUserLoginAndPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson" type="screen"/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?view=diff&rev=479016&r1=479015&r2=479016
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Fri Nov 24 13:59:51 2006
@@ -52,47 +52,6 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="lookupDataResourceContent"
-        default-title-style="tableheadtext"
-        default-entity-name="DataResourceContentView"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        default-map-name="currentValue"
-        target="LookupSubContent"
-        title="" type="single">
-        <field name="dataResourceId" title="DataResource Id">
-            <text-find/>
-        </field>
-        <field name="coContentId" title="Content Id">
-            <text-find/>
-        </field>
-        <field name="coContentName" title="Name">
-            <text-find/>
-        </field>
-        <field name="coDescription">
-            <text-find/>
-        </field>
-        <field name="createdByUserLogin">
-             <lookup target-form-name="LookupPerson" />
-        </field>
-        <field name="createdDate">
-            <date-find/>
-        </field>
-        <field name="lastModifiedByUserLogin">
-             <lookup target-form-name="LookupParty" />
-        </field>
-        <field name="lastModifiedDate">
-            <date-find/>
-        </field>
-        <field name="submitButton" title="Find" widget-style="smallSubmit">
-            <submit button-type="button"/>
-        </field>
-        <field name="contentIdTo">
-            <hidden value="${contentIdTo}"/>
-        </field>
-        <field name="mapKey">
-            <hidden value="${mapKey}"/>
-        </field>
-    </form>
 
     <!-- LayoutEdit forms -->
     <form name="EditLayout"
@@ -242,31 +201,6 @@
         </field>
     </form>
 
-    <form
-        name="listLookupDataResourceContent"
-        default-entity-name="DataResourceContentView"
-        default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="mruList"
-        target="" title="" type="list">
-        <field name="replace" title="Replace" widget-style="buttontext" >
-            <hyperlink also-hidden="false" target-type="plain" description="Replace[${dataResourceId}/${coContentId}]"
-               target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')"
-            />
-        </field>
-        <field name="pasteContent" title="Paste" widget-style="buttontext" >
-                
-            <hyperlink also-hidden="false" target-type="plain" description="Paste[${dataResourceId}/${coContentId}]"
-               target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"
-            />
-        </field>
-        <field name="dataResourceName" title="Name" widget-style="buttontext">
-                <display/>
-        </field>
-        <field name="dataCategoryId" title="Category" widget-style="buttontext">
-                <display/>
-        </field>
-    </form>
     <form name="LayoutSubContentMaster"
         default-title-style="tableheadtext"
         default-entity-name="SubContentDataResourceView"

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?view=diff&rev=479016&r1=479015&r2=479016
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Fri Nov 24 13:59:51 2006
@@ -36,4 +36,76 @@
         <field name="description"><display/></field>
         <field name="drObjectInfo" title="Template File"><display/></field>
     </form>
+
+    <form name="lookupDataResourceContent"
+        default-title-style="tableheadtext"
+        default-entity-name="DataResourceContentView"
+        default-tooltip-style="tabletext" default-widget-style="inputBox"
+        target="LookupSubContent"
+        title="" type="single">
+        <field name="dataResourceId" title="DataResource Id">
+            <text-find/>
+        </field>
+        <field name="coContentId" title="Content Id">
+            <text-find/>
+        </field>
+        <field name="coContentName" title="Name">
+            <text-find/>
+        </field>
+        <field name="coDescription">
+            <text-find/>
+        </field>
+        <field name="createdByUserLogin">
+             <lookup target-form-name="LookupPerson" />
+        </field>
+        <field name="createdDate">
+            <date-find/>
+        </field>
+        <field name="lastModifiedByUserLogin">
+             <lookup target-form-name="LookupParty" />
+        </field>
+        <field name="lastModifiedDate">
+            <date-find/>
+        </field>
+        <field name="submitButton" title="Find" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+        <field name="contentIdTo">
+            <hidden value="${contentIdTo}"/>
+        </field>
+        <field name="mapKey">
+            <hidden value="${mapKey}"/>
+        </field>
+    </form>
+
+    <form
+        name="listLookupDataResourceContent"
+        default-entity-name="DataResourceContentView"
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="tabletext"
+        list-name="listIt" paginate-target="LookupSubContent"
+        target="" 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="DataResourceContentView"/>
+            </service>
+        </actions>
+        <field name="replace" title="Replace" widget-style="buttontext" >
+            <hyperlink also-hidden="false" target-type="plain" description="Replace[${dataResourceId}/${coContentId}]"
+               target="javascript:execRemoteCall('replaceSubContent','${dataResourceId}','${coContentId}', '${contentIdTo}', '${mapKey}')"
+            />
+        </field>
+        <field name="pasteContent" title="Paste" widget-style="buttontext" >
+            <hyperlink also-hidden="false" target-type="plain" description="Paste[${dataResourceId}/${coContentId}]"
+               target="javascript:execRemoteCall('pasteContent','${dataResourceId}','${coContentId}')"/>
+        </field>
+        <field name="dataResourceName" title="Name" widget-style="buttontext">
+            <display/>
+        </field>
+        <field name="dataCategoryId" title="Category" widget-style="buttontext">
+            <display/>
+        </field>
+    </form>
+
 </forms>

Modified: incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml?view=diff&rev=479016&r1=479015&r2=479016
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml Fri Nov 24 13:59:51 2006
@@ -41,4 +41,28 @@
             </widgets>
         </section>
     </screen>
+    <screen name="LookupSubContent">
+        <section>
+            <condition>
+                <or>
+                    <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+                </or>
+            </condition>
+            <actions>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="title" value="Lookup List Layout"/>
+                <set field="queryString" from-field="result.queryString"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.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="lookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
+                        <include-form name="listLookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>