Author: jacopoc
Date: Sat Nov 4 08:13:43 2006
New Revision: 471225
URL: http://svn.apache.org/viewvc?view=rev&rev=471225
Log:
Misc cleanups for the content component.
Removed:
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/cms/ContentSetupMenu.xml
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/pagedefs/layout/LayoutMenu.xml
Modified:
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/content/widget/data/DataResourceScreens.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=471225&r1=471224&r2=471225
==============================================================================
---
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
(original)
+++
incubator/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
Sat Nov 4 08:13:43 2006
@@ -663,10 +663,9 @@
<security auth="true" https="true"/>
<response name="success" type="view" value="FindContent"/>
</request-map>
- <request-map uri="ContentSetupMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="ContentSetupMenu"/></request-map>
- <request-map uri="DataSetupMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="DataSetupMenu"/></request-map>
- <request-map uri="LayoutMenu"><security auth="true"
https="true"/><response name="success" type="view"
value="LayoutMenu"/></request-map>
- <request-map uri="CMSMenu"><security auth="true" https="true"/><response
name="success" type="view" value="CMSMenu"/></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>
<!-- Content requests -->
<request-map uri="EditContent">
@@ -1614,9 +1613,6 @@
<view-map name="EditLayoutUrl" page="/layout/EditLayoutUrl.ftl"
type="jpublish"/>
<view-map name="FindContent"
page="component://content/widget/content/ContentScreens.xml#FindContent"
type="screen"/>
- <view-map name="ContentSetupMenu" page="/cms/ContentSetupMenu.ftl"
type="jpublish"/>
- <view-map name="DataSetupMenu" page="/datasetup/DataSetupMenu.ftl"
type="jpublish"/>
- <view-map name="LayoutMenu" page="/layout/LayoutMenu.ftl" type="jpublish"/>
<view-map name="subcontent" page="/subcontent.ftl" type="jpublish"/>
<view-map name="FindSurvey"
page="component://content/widget/SurveyScreens.xml#FindSurvey" type="screen"/>
@@ -1641,7 +1637,6 @@
<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="CMSMenu" page="/cms/CMSMenu.ftl" type="jpublish"/>
<view-map name="EditAddSubContent"
page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent"
type="screen"/>
<view-map name="TestPermission"
page="component://content/widget/cms/CMSScreens.xml#TestPermission"
type="screen"/>
Modified:
incubator/ofbiz/trunk/applications/content/widget/data/DataResourceScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/widget/data/DataResourceScreens.xml?view=diff&rev=471225&r1=471224&r2=471225
==============================================================================
---
incubator/ofbiz/trunk/applications/content/widget/data/DataResourceScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/content/widget/data/DataResourceScreens.xml
Sat Nov 4 08:13:43 2006
@@ -127,7 +127,8 @@
</widgets>
</section>
</screen>
- <!--screen name="AddDataResource">
+ <!--
+ <screen name="AddDataResource">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
