Author: erwan
Date: Wed Apr 21 16:16:40 2010
New Revision: 936385
URL: http://svn.apache.org/viewvc?rev=936385&view=rev
Log:
Corrections on rev 935923
* corrected a wrong controller entry
* added a missing decorator (uiLabelDecorator)
* added a collapse button for the GenericScreenlet
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=936385&r1=936384&r2=936385&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Wed
Apr 21 16:16:40 2010
@@ -141,7 +141,7 @@ under the License.
<!-- View Mappings -->
<view-map name="showPortalPage" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
<view-map name="showPortlet" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
- <view-map name="showPortletUiLabelDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletUiLebelDecorator"/>
+ <view-map name="showPortletUiLabelDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletUiLabelDecorator"/>
<view-map name="showPortletMainDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/>
<view-map name="showPortletSimpleDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/>
<view-map name="ManagePortalPages" type="screen"
page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=936385&r1=936384&r2=936385&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Wed Apr 21
16:16:40 2010
@@ -220,7 +220,7 @@ under the License.
<script
location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
</actions>
<widgets>
- <screenlet title="${uiLabelMap.${titleLabel}}">
+ <screenlet title="${uiLabelMap.${titleLabel}}"
collapsible="true" id="scrlt_${formName}">
<include-form name="${formName}"
location="${formLocation}"/>
</screenlet>
</widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=936385&r1=936384&r2=936385&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Wed Apr 21
16:16:40 2010
@@ -50,6 +50,26 @@ under the License.
</section>
</screen>
+ <screen name="uiLabelDecorator">
+ <section>
+ <actions>
+ <property-map resource="MyPortalUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="ContentUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="ProjectMgrUiLabels"
map-name="uiLabelMap" global="true"/>
+ <property-map resource="HumanResUiLabels"
map-name="uiLabelMap" global="true"/>
+ </actions>
+ <widgets>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonPartyDecorator">
<section>
<actions>
