Author: jleroux
Date: Mon Jul 28 03:25:29 2008
New Revision: 680312
URL: http://svn.apache.org/viewvc?rev=680312&view=rev
Log:
A fixing patch from Bruno Busco "Using FindScreenDecorator in Content
Application" (https://issues.apache.org/jira/browse/OFBIZ-1881) - OFBIZ-1881
Sorry to have missed this
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/applications/content/widget/SurveyScreens.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=680312&r1=680311&r2=680312&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Mon
Jul 28 03:25:29 2008
@@ -1747,8 +1747,6 @@
<view-map name="FindSurvey"
page="component://content/widget/SurveyScreens.xml#FindSurvey" type="screen"/>
<view-map name="ListFindSurveySearchResults" type="screen"
page="component://content/widget/SurveyScreens.xml#ListFindSurveySearchResults"/>
- <view-map name="ListFindSurveySearchResults" type="screen"
page="component://content/widget/SurveyScreens.xml#ListFindSurveySearchResults"/>
-
<view-map name="EditSurvey"
page="component://content/widget/SurveyScreens.xml#EditSurvey" type="screen"/>
<view-map name="EditSurveyMultiResps"
page="component://content/widget/SurveyScreens.xml#EditSurveyMultiResps"
type="screen"/>
<view-map name="EditSurveyQuestions"
page="component://content/widget/SurveyScreens.xml#EditSurveyQuestions"
type="screen"/>
Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=680312&r1=680311&r2=680312&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Mon Jul 28
03:25:29 2008
@@ -35,34 +35,17 @@
<if-has-permission permission="CONTENTMGR"
action="_VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindSurvey}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link
text="${uiLabelMap.SurveyCreate}" target="EditSurvey"
style="buttontext"/></container>
- <include-form
name="FindSurvey"
location="component://content/webapp/content/survey/SurveyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.PageTitleFindSurvey}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form
name="ListFindSurvey"
location="component://content/webapp/content/survey/SurveyForms.xml"/>
</widgets>
- </section>
- </container>
- </container>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container style="button-bar"><link
text="${uiLabelMap.SurveyCreate}" target="EditSurvey"
style="buttontext"/></container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindSurvey"
location="component://content/webapp/content/survey/SurveyForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListFindSurvey"
location="component://content/webapp/content/survey/SurveyForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.WorkEffortViewPermissionError}</label>
