svn commit: r479008 - in /incubator/ofbiz/trunk/applications/content: webapp/content/WEB-INF/ webapp/content/WEB-INF/pagedefs/layout/ webapp/content/layout/ webapp/content/lookup/ widget/

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

svn commit: r479008 - in /incubator/ofbiz/trunk/applications/content: webapp/content/WEB-INF/ webapp/content/WEB-INF/pagedefs/layout/ webapp/content/layout/ webapp/content/lookup/ widget/

jacopoc
Author: jacopoc
Date: Fri Nov 24 13:36:34 2006
New Revision: 479008

URL: http://svn.apache.org/viewvc?view=rev&rev=479008
Log:
One more JPublish page converted to screen widget.

Added:
    incubator/ofbiz/trunk/applications/content/webapp/content/lookup/
    incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml   (with props)
    incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml   (with props)
Removed:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/LookupListLayout.xml
Modified:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.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=479008&r1=479007&r2=479008
==============================================================================
--- 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:36:34 2006
@@ -1667,7 +1667,7 @@
     <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"/>
+    <view-map name="LookupListLayout" page="component://content/widget/LookupScreens.xml#LookupListLayout" type="screen"/>
     <view-map name="LookupSubContent" page="/layout/LookupSubContent.ftl" type="jpublish"/>
     <!-- lookup other components -->
     <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" 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=479008&r1=479007&r2=479008
==============================================================================
--- 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:36:34 2006
@@ -242,20 +242,6 @@
         </field>
     </form>
 
-    <form name="lookupListLayout"
-        default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        default-entity-name="ContentAssocDataResourceViewFrom"
-        list-name="entityList" target="" paginate-target="FindLayout" title="" type="list">
-        <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')"/>
-        </field>
-        <field name="contentName"><display/></field>
-        <field name="description"><display/></field>
-        <field name="drObjectInfo" title="Template File"><display/></field>
-    </form>
-
-
     <form
         name="listLookupDataResourceContent"
         default-entity-name="DataResourceContentView"

Added: 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=auto&rev=479008
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (added)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Fri Nov 24 13:36:34 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    
+    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="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+    <form name="lookupListLayout"
+        default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="tabletext"
+        default-entity-name="ContentAssocDataResourceViewFrom"
+        list-name="entityList" target="" paginate-target="LookupListLayout" title="" type="list">
+        <actions>
+            <entity-condition entity-name="ContentAssocDataResourceViewFrom" list-name="entityList" >
+                <condition-expr field-name="caContentIdTo" value="TEMPLATE_MASTER"/>
+            </entity-condition>
+        </actions>
+        <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${contentId}" target-type="plain" target="javascript:execRemoteCall('cloneLayout', '${drDataResourceId}', '${contentId}', 'TEMPLATE_MASTER', '')"/>
+        </field>
+        <field name="contentName"><display/></field>
+        <field name="description"><display/></field>
+        <field name="drObjectInfo" title="Template File"><display/></field>
+    </form>
+</forms>

Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml?view=auto&rev=479008
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml (added)
+++ incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml Fri Nov 24 13:36:34 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+    <screen name="LookupListLayout">
+        <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="lookupListLayout" location="component://content/webapp/content/lookup/LookupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>

Propchange: incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: incubator/ofbiz/trunk/applications/content/widget/LookupScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml