svn commit: r702239 - in /ofbiz/trunk/applications/content: webapp/content/WEB-INF/ webapp/content/cms/ webapp/content/layout/ widget/compdoc/ widget/content/ widget/forum/

[mrisaliti]

Author: mrisaliti
Date: Mon Oct  6 12:37:08 2008
New Revision: 702239

URL: http://svn.apache.org/viewvc?rev=702239&view=rev
Log:
Some cleanup on content component (Part of issue OFBIZ-1982)

Modified:
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
    ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Mon Oct  6 12:37:08 2008
@@ -815,7 +815,7 @@
     </request-map>
 
     <!-- DataResource requests -->
-    <request-map uri="editDataResource">
+    <request-map uri="EditDataResource">
         <security auth="true" https="true"/>
         <response name="success" type="view" value="EditDataResource"/>
     </request-map>
@@ -1019,17 +1019,13 @@
     <!-- combined with FindCompDoc: <request-map uri="ListCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="ListCompDoc"/></request-map> -->
     <request-map uri="EditRootCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDoc"/></request-map>
     <request-map uri="EditChildCompDoc"><security auth="true" https="true"/><response name="success" type="view" value="EditChildCompDoc"/></request-map>
-    <request-map uri="ViewCompDocTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocTree"/></request-map>
     <request-map uri="ViewCompDocTemplateTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocTemplateTree"/></request-map>
     <request-map uri="ViewCompDocInstanceTree"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocInstanceTree"/></request-map>
-    <request-map uri="CompDocTemplateTree"><security auth="true" https="true"/><response name="success" type="view" value="CompDocTemplateTree"/></request-map>
-    <request-map uri="EditRootCompDocContent"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDocContent"/></request-map>
     
     <request-map uri="AddRootCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="AddRootCompDocInstance"/></request-map>
     <request-map uri="AddRootCompDocTemplate"><security auth="true" https="true"/><response name="success" type="view" value="AddRootCompDocTemplate"/></request-map>
     <request-map uri="ViewInstances"><security auth="true" https="true"/><response name="success" type="view" value="ViewInstances"/></request-map>
-    <request-map uri="EditRootCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="EditRootCompDocInstance"/></request-map>
-  
+    
     <request-map uri="AddChildCompDocInstance"><security auth="true" https="true"/><response name="success" type="view" value="AddChildCompDocInstance"/></request-map>
     <request-map uri="AddChildCompDocTemplate"><security auth="true" https="true"/><response name="success" type="view" value="AddChildCompDocTemplate"/></request-map>
     <request-map uri="ViewCompDocContentBinary"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocContentBinary"/></request-map>
@@ -1037,8 +1033,8 @@
     <request-map uri="createCompDocTemplate">
         <security auth="true" https="true"/>
         <event invoke="persistContentAndAssoc" path="" type="service"/>
-        <response name="success" type="view" value="EditCompDocTemplate"/>
-        <response name="error" type="view" value="EditCompDocTemplate"/>
+        <response name="success" type="view" value="EditRootCompDoc"/>
+        <response name="error" type="view" value="EditRootCompDoc"/>
     </request-map>
     <request-map uri="updateCompDoc">
         <security auth="true" https="true"/>
@@ -1094,7 +1090,10 @@
         <response name="success" type="view" value="EditChildCompDoc"/>
         <response name="error" type="view" value="EditChildCompDoc"/>
     </request-map>
-    <request-map uri="ViewCompDocContent"><security auth="true" https="true"/><response name="success" type="view" value="ViewCompDocContent"/></request-map>
+    <request-map uri="ViewCompDocContent">
+        <security auth="true" https="true"/>
+        <response name="success" type="view" value="ViewCompDocContent"/>
+    </request-map>
     <request-map uri="updateChildCompDocInstance">
         <security auth="true" https="true"/>
         <event invoke="persistCompDoc"  path="" type="service"/>
@@ -1328,7 +1327,7 @@
     </request-map>
     <request-map uri="deleteSurveyQuestion">
         <security auth="true" https="true"/>
-        <event invoke="deleteteSurveyQuestion" type="service"/>
+        <event invoke="deleteSurveyQuestion" type="service"/>
         <response name="success" type="view" value="EditSurveyQuestions"/>
         <response name="error" type="view" value="EditSurveyQuestions"/>
     </request-map>
@@ -1348,7 +1347,7 @@
     </request-map>
     <request-map uri="deleteSurveyQuestionOption">
         <security auth="true" https="true"/>
-        <event invoke="deleteteSurveyQuestionOption" type="service"/>
+        <event invoke="deleteSurveyQuestionOption" type="service"/>
         <response name="success" type="view" value="EditSurveyQuestions"/>
         <response name="error" type="view" value="EditSurveyQuestions"/>
     </request-map>
@@ -1531,13 +1530,9 @@
     <!-- ================ CMS Requests ================= -->
     
     <request-map uri="UserPermissions"><security auth="true" https="true"/><response name="success" type="view" value="UserPermissions"/></request-map>
-    <request-map uri="CMSSiteFind"><security auth="true" https="true"/><response name="success" type="view" value="CMSSiteFind"/></request-map>
-    <request-map uri="CMSSiteEdit"><security auth="true" https="true"/><response name="success" type="view" value="CMSSiteEdit"/></request-map>
     <request-map uri="CMSContentFind"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentFind"/></request-map>
-    <request-map uri="CMSFindOwnedContent"><security auth="true" https="true"/><response name="success" type="view" value="CMSFindOwnedContent"/></request-map>
     <request-map uri="CMSContentEdit"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentEdit"/></request-map>
     <request-map uri="CMSContentAdd"><security auth="true" https="true"/><response name="success" type="view" value="CMSContentAdd"/></request-map>
-    <request-map uri="CMSEditContentPurposeOperation"><security auth="true" https="true"/><response name="success" type="view" value="CMSEditContentPurposeOperation"/></request-map>
     <request-map uri="CMSSites"><security auth="true" https="true"/><response name="success" type="view" value="CMSSites"/></request-map>
     <request-map uri="updateSiteRoles">
         <security https="true" auth="true"/>
@@ -1591,7 +1586,6 @@
         <response name="success" type="view" value="EditAddContent"/>
         <response name="error" type="view" value="EditAddSubContent"/>
     </request-map>
-    <request-map uri="EditAddImage"><security https="true" auth="true"/><response name="success" type="view" value="EditAddImage"/></request-map>
     <request-map uri="persistContent">
         <security auth="true" https="true"/>
         <event invoke="persistContentAndAssoc" path="" type="service"/>
@@ -1602,7 +1596,7 @@
         <security auth="true" https="true"/>
         <event type="java" path="org.ofbiz.content.content.UploadContentAndImage" invoke="uploadContentAndImage"/>
         <response name="success" type="view" value="CMSContentEdit"/>
-        <response name="error" type="view" value="EditAddImage"/>
+        <response name="error" type="view" value="EditAddContent"/>
     </request-map>
     <request-map uri="AdminSearch"><security https="true" auth="true"/><response name="success" type="view" value="AdminSearch"/></request-map>
     <request-map uri="AdminIndex"><security https="true" auth="true"/><response name="success" type="view" value="AdminIndex"/></request-map>
@@ -1692,8 +1686,7 @@
     <view-map name="findContentSearchResults" type="screen" page="component://content/widget/content/ContentScreens.xml#findContentSearchResults"/>
     <view-map name="EditContent" page="component://content/widget/content/ContentScreens.xml#EditContent" type="screen"/>
     <view-map name="EditContentAssoc" page="component://content/widget/content/ContentScreens.xml#EditContentAssoc" type="screen"/>
-    <view-map name="AddContent" page="component://content/widget/content/ContentScreens.xml#AddContent" type="screen"/>
-
+    
     <view-map name="EditContentAttribute" page="component://content/widget/content/ContentScreens.xml#EditContentAttribute" type="screen"/>
     <view-map name="EditContentMetaData" page="component://content/widget/content/ContentScreens.xml#EditContentMetaData" type="screen"/>
     <view-map name="EditContentType" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentType" type="screen"/>
@@ -1753,18 +1746,13 @@
     <view-map name="ViewSurveyResponses" page="component://content/widget/SurveyScreens.xml#ViewSurveyResponses" type="screen"/>
     <view-map name="EditSurveyResponse" page="component://content/widget/SurveyScreens.xml#EditSurveyResponse" type="screen"/>
 
-    <view-map name="CMSSiteFind" page="component://content/widget/cms/CMSScreens.xml#CMSSiteFind" type="screen"/>
-    <view-map name="CMSSiteEdit" page="component://content/widget/cms/CMSScreens.xml#CMSSiteEdit" type="screen"/>
     <view-map name="CMSContentFind" page="component://content/widget/cms/CMSScreens.xml#CMSContentFind" type="screen"/>
     <view-map name="CMSContentEdit" page="component://content/widget/cms/CMSScreens.xml#CMSContentEdit" type="screen"/>
     <view-map name="CMSContentAdd" page="component://content/widget/cms/CMSScreens.xml#CMSContentAdd" type="screen"/>
-    <view-map name="CMSContentOwnedFind" page="component://content/widget/cms/CMSScreens.xml#CMSContentOwnedFind" type="screen"/>
     <view-map name="UserPermissions" page="component://content/widget/contentsetup/ContentSetupScreens.xml#UserPermissions" type="screen"/>
     <view-map name="CMSSites" page="component://content/widget/cms/CMSScreens.xml#CMSSites" type="screen"/>
-    <view-map name="CMSEditContentPurposeOperation" page="component://content/widget/cms/CMSScreens.xml#CMSEditContentPurposeOperation" type="screen"/>
     <view-map name="addSubSite" page="component://content/widget/cms/CMSScreens.xml#addSubSite" type="screen"/>
     <view-map name="EditAddContent" page="component://content/widget/cms/CMSScreens.xml#EditAddContent" type="screen"/>
-    <view-map name="EditAddImage" page="component://content/widget/cms/CMSScreens.xml#EditAddImage" type="screen"/>
     <view-map name="AdminSearch" page="component://content/widget/cms/CMSScreens.xml#AdminSearch" type="screen"/>
     <view-map name="AdminIndex" page="component://content/widget/cms/CMSScreens.xml#AdminIndex" type="screen"/>
     <view-map name="EditAddSubContent" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent" type="screen"/>
@@ -1786,21 +1774,16 @@
     <view-map name="AddChildCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocInstance" type="screen"/>
     <view-map name="AddChildCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocTemplate" type="screen"/>
 
-    <view-map name="EditRootCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocInstance" type="screen"/>
     <view-map name="AddRootCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocInstance" type="screen"/>
     <view-map name="AddRootCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocTemplate" type="screen"/>
 
     <view-map name="ViewCompDocTemplateTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTemplateTree" type="screen"/>
     <view-map name="ViewCompDocInstanceTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocInstanceTree" type="screen"/>
-    <view-map name="ViewCompDocTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTree" type="screen"/>
-    <view-map name="EditCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocInstance" type="screen"/>
-    <view-map name="EditCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocTemplate" type="screen"/>
-    <view-map name="CompDocTemplateTree" page="component://content/widget/compdoc/CompDocScreens.xml#CompDocTemplateTree" type="screen"/>
-    <view-map name="EditRootCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDocContent" type="screen"/>
     <view-map name="EditCompDocContentRole" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocContentRole" type="screen"/>
     <view-map name="ViewInstances" page="component://content/widget/compdoc/CompDocScreens.xml#ViewInstances" type="screen"/>
     <view-map name="ViewCompDocContentBinary" page="" type="simplecontent"/>
-
+    <view-map name="ViewCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocContent" type="screen"/>
+    
     <view-map name="ViewSimpleContent" page="" type="simplecontent"/>
 
     <!-- lookup content component -->

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Mon Oct  6 12:37:08 2008
@@ -53,18 +53,14 @@
        <menu-item name="contentfind" title="${uiLabelMap.ContentContent}" >
             <link id="CMSContentFind" target="CMSContentFind?listSize=${content.listSize}&amp;highIndex=${content.highIndex}&amp;lowIndex=${content.lowIndex}&amp;viewSize=${content.viewSize}&amp;viewIndex=${content.viewIndex}&amp;queryString=${content.queryString}" >
             </link>
-        </menu-item>
-       <menu-item name="ownedcontentfind" title="${uiLabelMap.ContentContent}" >
-            <link id="CMSFindOwnedContent" target="CMSFindOwnedContent?listSize=${content.listSize}&amp;highIndex=${content.highIndex}&amp;lowIndex=${content.lowIndex}&amp;viewSize=${content.viewSize}&amp;viewIndex=${content.viewIndex}&amp;queryString=${content.queryString}" >
-            </link>
-        </menu-item>
+       </menu-item>
        <menu-item name="contentedit" title="${uiLabelMap.CommonEdit}" >
             <link id="CMSContentEdit" target="CMSContentEdit?contentId=${content.currentValue.contentId}&amp;dataResourceId=${content.currentValue.dataResourceId}"/>
-        </menu-item>
+       </menu-item>
        <menu-item name="contentadd" title="${uiLabelMap.CommonAdd}" >
             <link id="CMSContentAdd" target="CMSContentAdd">
             </link>
-        </menu-item>
+       </menu-item>
 
     </menu>
 

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Mon Oct  6 12:37:08 2008
@@ -366,7 +366,7 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceViewTo" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
+    <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceView" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" title="Edit" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Mon Oct  6 12:37:08 2008
@@ -1301,8 +1301,8 @@
             <widgets>
                 <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <include-form name="ListContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
-                        <include-form name="AddContentRole" location="component://content/webapp/content/content/ContentForms.xml"/>
+                        <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/>
+                        <include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Mon Oct  6 12:37:08 2008
@@ -101,25 +101,6 @@
             </widgets>
         </section>
     </screen>
-    <!--screen name="AddContent">
-        <section>
-            <actions>
-                <set field="headerItem" value="Content"/>
-                <set field="title" value="CMS Content Edit Page"/>
-                <set field="titleProperty" value="PageTitleAddContent"/>
-                <set field="currentContentMenuItemName" value="AddContent" to-scope="user"/>
-                <set field="tabButtonItem" value="content"/>
-                <set field="titleProperty" value="PageTitleAddContent"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="commonContentDecorator"  location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <include-form name="AddContent" location="component://content/widget/content/ContentForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen-->
     <screen name="EditContentAssoc">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=702239&r1=702238&r2=702239&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Mon Oct  6 12:37:08 2008
@@ -264,7 +264,7 @@
                                     <container style="screenlet-body">
                                         <section>
                                             <widgets>    
-                                                <include-form name="EditForumThread" location="component://content/widget/forum/ForumForms.xml"/>
+                                                <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/>
                                             </widgets>
                                         </section>
                                     </container>