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

[jacopoc]

Author: jacopoc
Date: Sun Nov  5 00:25:56 2006
New Revision: 471376

URL: http://svn.apache.org/viewvc?view=rev&rev=471376
Log:
Two content pages 'converted' from JPublish to widgets.

Removed:
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/FindLayout.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/ListLayout.xml
    incubator/ofbiz/trunk/applications/content/webapp/content/layout/FindLayout.ftl
    incubator/ofbiz/trunk/applications/content/webapp/content/layout/ListLayout.ftl
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/widget/CommonScreens.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=471376&r1=471375&r2=471376
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sun Nov  5 00:25:56 2006
@@ -662,7 +662,7 @@
     </request-map>
     <request-map uri="ContentSetupMenu"><security auth="true" https="true"/><response name="success" type="view" value="EditContentType"/></request-map>
     <request-map uri="DataSetupMenu"><security auth="true" https="true"/><response name="success" type="view" value="EditDataResourceType"/></request-map>
-    <request-map uri="LayoutMenu"><security auth="true" https="true"/><response name="success" type="view" value="EditLayout"/></request-map>
+    <request-map uri="LayoutMenu"><security auth="true" https="true"/><response name="success" type="view" value="ListLayout"/></request-map>
 
     <!-- Content requests -->
     <request-map uri="EditContent">
@@ -1292,7 +1292,7 @@
     </request-map>
     <request-map uri="FindLayout"><security auth="true" https="true"/><response name="success" type="view" value="FindLayout"/></request-map>
     <request-map uri="EditLayout"><security auth="true" https="true"/><response name="success" type="view" value="EditLayout"/></request-map>
-    <request-map uri="AddLayout"><security auth="true" https="true"/><response name="success" type="view" value="EditLayoutTemplate"/></request-map>
+    <request-map uri="AddLayout"><security auth="true" https="true"/><response name="success" type="view" value="AddLayout"/></request-map>
     <request-map uri="createLayout">
         <security auth="true" https="true"/>
         <event invoke="createLayout" path="org/ofbiz/content/layout/LayoutEvents.xml" type="simple"/>
@@ -1594,8 +1594,8 @@
     <view-map name="EditFileExtension" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditFileExtension" type="screen"/>
     <view-map name="EditMimeType" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeType" type="screen"/>
 
-    <view-map name="ListLayout" page="/layout/ListLayout.ftl" type="jpublish"/>
-    <view-map name="FindLayout" page="/layout/FindLayout.ftl" type="jpublish"/>
+    <view-map name="ListLayout" page="component://content/widget/layout/LayoutScreens.xml#ListLayout" type="screen"/>
+    <view-map name="FindLayout" page="component://content/widget/layout/LayoutScreens.xml#FindLayout" type="screen"/>
     <view-map name="EditLayout" page="/layout/EditLayout.ftl" type="jpublish"/>
     <view-map name="AddLayout" page="/layout/AddLayout.ftl" type="jpublish"/>
     <view-map name="EditLayoutSubContent" page="/layout/EditLayoutSubContent.ftl" type="jpublish"/>

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=471376&r1=471375&r2=471376
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sun Nov  5 00:25:56 2006
@@ -24,6 +24,9 @@
         default-tooltip-style="tabletext" default-widget-style="inputBox"
         target="FindLayout" title="" type="single">
         <!--<auto-fields-entity entity-name="Content" default-field-type="find" />-->
+        <field name="contentTypeId">
+            <hidden value="DOCUMENT"/>
+        </field>
         <field name="contentId">
             <text-find/>
         </field>
@@ -48,10 +51,6 @@
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-        <field name="createLink" title="" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreateNew}"  
-             target="EditLayoutSubContent?mode=add&amp;contentIdTo=TEMPLATE_MASTER"/>
-        </field>
     </form>
     <form name="lookupDataResourceContent"
         default-title-style="tableheadtext"
@@ -205,7 +204,14 @@
         default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="display"
         default-entity-name="ContentDataResourceView"
-        list-name="entityList" target="" paginate-target="FindLayout" title="" type="list">
+        list-name="listIt" target="" paginate-target="FindLayout" title="" type="list">
+       <actions>
+            <set field="requestParameters.contentTypeId" value="DOCUMENT"/>
+          <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="ContentDataResourceView"/>
+          </service>
+       </actions>
         <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>
@@ -224,7 +230,7 @@
         default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="display"
         default-entity-name="ContentAssocDataResourceViewFrom"
-        list-name="entityList" target="" paginate-target="FindLayout" title="" type="list">
+        list-name="layoutList" target="" paginate-target="FindLayout" title="" type="list">
         <field name="contentId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>

Modified: incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml?view=diff&rev=471376&r1=471375&r2=471376
==============================================================================
--- incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Nov  5 00:25:56 2006
@@ -206,7 +206,23 @@
             </widgets>
         </section>
     </screen>
-    
+
+    <screen name="commonLayoutDecorator">
+        <section>
+            <actions>
+                <set field="tabButtonItem" from-field="tabButtonItem" from-scope="user"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="mainContentDecorator" location="component://content/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <include-menu name="layout" location="component://content/webapp/content/layout/LayoutMenus.xml"/>
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
     <screen name="main">
         <section>
             <widgets>