You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/07/16 22:47:58 UTC
svn commit: r677422 - in /ofbiz/trunk:
applications/party/webapp/partymgr/communication/
applications/party/widget/partymgr/
specialpurpose/mypage/webapp/mypage/WEB-INF/ specialpurpose/mypage/widget/
Author: hansbak
Date: Wed Jul 16 13:47:57 2008
New Revision: 677422
URL: http://svn.apache.org/viewvc?rev=677422&view=rev
Log:
add some more information to the communication overview screen and reuse in mypage
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=677422&r1=677421&r2=677422&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Wed Jul 16 13:47:57 2008
@@ -132,7 +132,7 @@
</entity-options>
</drop-down>
</field>
- <field name="contactMechIdTo" title="${uiLabelMap.PartyPartyTo}">
+ <field name="contactMechIdTo" title="${uiLabelMap.PartyEmailTo}">
<lookup target-form-name="LookupPartyEmail"/>
</field>
<field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
@@ -629,11 +629,11 @@
<script location="component://party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy"/>
</actions>
<field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field>
- <field name="partyId" tooltip="leave empty for new 'Party'" position="1"><lookup target-form-name="LookupPartyName"/></field>
- <field name="emailAddress" position="2"><text/></field>
+ <field name="partyId" tooltip="leave empty for new 'Party'"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="emailAddress"><text/></field>
<field name="firstName" position="1"><text/></field>
<field name="middleName" position="2"><text/></field>
- <field name="lastName" position="3"><text/></field>
+ <field name="lastName"><text/></field>
<field name="submit" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="EditRequestFromCommEvent" type="single" target="createRequestFromCommEvent" default-map-name="parameters">
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=677422&r1=677421&r2=677422&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Wed Jul 16 13:47:57 2008
@@ -177,6 +177,9 @@
<decorator-screen name="CommonCommunicationEventDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container style="lefthalf">
+ <label style="h1" text="Communication Event id: ${parameters.communicationEventId}"></label>
+ <screenlet title="Communication info">
<section>
<condition>
<or><!-- have for e-mails a special form -->
@@ -216,18 +219,33 @@
name="ViewCommEvent" />
</fail-widgets>
</section>
+ </screenlet>
+ </container>
+ <container style="righthalf">
+ <section>
+ <actions>
+ <entity-and list-name="commEvents" entity-name="CommunicationEvent">
+ <field-map field-name="parentCommEventId" value="parameters.communicationEventId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}">
+ <include-form name="ListCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
<section>
<actions>
<set field="entityName" value="CustRequestAndCommEvent"/>
<set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/>
</actions>
<widgets>
- <label style="h1" text="${uiLabelMap.OrderRequestList}"/>
- <screenlet>
+ <screenlet title="${uiLabelMap.OrderRequestList}">
<include-form name="ListRequests" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</widgets>
</section>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml?rev=677422&r1=677421&r2=677422&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/controller.xml Wed Jul 16 13:47:57 2008
@@ -200,7 +200,6 @@
<view-map name="myCompanyComms" type="screen" page="component://mypage/widget/CommonScreens.xml#MyCompanyComms"/>
<view-map name="myTimesheet" type="screen" page="component://mypage/widget/CommonScreens.xml#MyTimesheet"/>
<view-map name="newEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#newEvent"/>
- <view-map name="ViewCommunicationEvent" type="screen" page="component://mypage/widget/MyPageScreens.xml#ViewCommunicationEvent"/>
</site-conf>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=677422&r1=677421&r2=677422&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Wed Jul 16 13:47:57 2008
@@ -110,8 +110,8 @@
</menu>
<menu name="MyCommunicationsMenu">
- <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}"><link target="newEmail?partyIdFrom=${partyId}"/></menu-item>
- <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}"><link target="newInternalNote?partyIdFrom=${partyId}"/></menu-item>
+ <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}"><link target="EditCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION"/></menu-item>
+ <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}"><link target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE"/></menu-item>
</menu>
<menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=677422&r1=677421&r2=677422&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Wed Jul 16 13:47:57 2008
@@ -20,9 +20,9 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
- <screen name="newEvent">
- <section>
- <widgets>
+ <screen name="newEvent">
+ <section>
+ <widgets>
<section>
<condition>
<if-empty field-name="parameters.Key" />
@@ -41,22 +41,22 @@
</actions>
<widgets />
</section>
- <section>
- <widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet>
- <include-form name="newEvent"
- location="component://mypage/widget/MyPageForms.xml" />
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet>
+ <include-form name="newEvent"
+ location="component://mypage/widget/MyPageForms.xml" />
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
<screen name="MyTimesheet">
<section>
<actions>
@@ -104,76 +104,76 @@
</widgets>
</section>
</screen>
- <screen name="MyTasks">
- <section>
- <actions>
- <entity-and entity-name="WorkEffortAndPartyAssign"
- list-name="tasks" filter-by-date="true">
- <field-map field-name="partyId" env-name="userLogin.partyId" />
- <field-map field-name="workEffortTypeId" value="TASK" />
- <field-map field-name="currentStatusId" value="PTS_CREATED" />
- </entity-and>
- </actions>
- <widgets>
- <section>
- <condition>
- <if-has-permission permission="PROJECTMGR"
- action="_VIEW" />
- </condition>
- <widgets>
- <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
- name="mytasks" collapsible="true" navigation-menu-name="MyTasksMenu">
- <include-menu name="MyTasksMenu"
- location="component://mypage/widget/MyPageMenus.xml" />
- <section>
- <condition>
- <not>
- <if-empty field-name="tasks" />
- </not>
- </condition>
- <widgets>
- <include-form name="MyTasks"
- location="component://mypage/widget/MyPageForms.xml" />
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
- </container>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
- </container>
- </fail-widgets>
- </section>
- </screenlet>
- </widgets>
- <fail-widgets>
- <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
- name="mytasks" collapsible="true">
- <section>
- <condition>
- <not>
- <if-empty field-name="tasks" />
- </not>
- </condition>
- <widgets>
- <include-form name="MyTasks"
- location="component://mypage/widget/MyPageForms.xml" />
- </widgets>
- <fail-widgets>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
- </container>
- <container>
- <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
- </container>
- </fail-widgets>
- </section>
- </screenlet>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
+ <screen name="MyTasks">
+ <section>
+ <actions>
+ <entity-and entity-name="WorkEffortAndPartyAssign"
+ list-name="tasks" filter-by-date="true">
+ <field-map field-name="partyId" env-name="userLogin.partyId" />
+ <field-map field-name="workEffortTypeId" value="TASK" />
+ <field-map field-name="currentStatusId" value="PTS_CREATED" />
+ </entity-and>
+ </actions>
+ <widgets>
+ <section>
+ <condition>
+ <if-has-permission permission="PROJECTMGR"
+ action="_VIEW" />
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
+ name="mytasks" collapsible="true" navigation-menu-name="MyTasksMenu">
+ <include-menu name="MyTasksMenu"
+ location="component://mypage/widget/MyPageMenus.xml" />
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="tasks" />
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="MyTasks"
+ location="component://mypage/widget/MyPageForms.xml" />
+ </widgets>
+ <fail-widgets>
+ <container>
+ <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
+ </container>
+ <container>
+ <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
+ </container>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"
+ name="mytasks" collapsible="true">
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="tasks" />
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="MyTasks"
+ location="component://mypage/widget/MyPageForms.xml" />
+ </widgets>
+ <fail-widgets>
+ <container>
+ <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label>
+ </container>
+ <container>
+ <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label>
+ </container>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </fail-widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen>
<screen name="MyCompanyComms">
<section>
@@ -195,63 +195,63 @@
</widgets>
</section>
</screen>
- <screen name="Communications">
- <section>
- <actions>
- <entity-condition entity-name="CommunicationEvent"
- list-name="commEvents">
- <condition-list combine="and">
- <condition-expr field-name="statusId" operator="not-equals"
- value="COM_UNKNOWN_PARTY" />
- <condition-list combine="or">
- <condition-expr field-name="partyIdFrom" operator="equals"
- value="${partyId}" />
- <condition-expr field-name="partyIdTo" operator="equals"
- value="${partyId}" />
- </condition-list>
- </condition-list>
- <order-by field-name="-lastUpdatedStamp" />
- </entity-condition>
- <entity-condition entity-name="CommunicationEvent"
- list-name="commEventsUnknown">
- <condition-list combine="and">
- <condition-expr field-name="statusId" operator="equals"
- value="COM_UNKNOWN_PARTY" />
- <condition-expr field-name="partyIdTo" operator="equals"
- env-name="partyId" />
- </condition-list>
- <order-by field-name="-lastUpdatedStamp" />
- </entity-condition>
- <entity-one entity-name="PartyNameView" value-name="partyName">
+ <screen name="Communications">
+ <section>
+ <actions>
+ <entity-condition entity-name="CommunicationEvent"
+ list-name="commEvents">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="not-equals"
+ value="COM_UNKNOWN_PARTY" />
+ <condition-list combine="or">
+ <condition-expr field-name="partyIdFrom" operator="equals"
+ value="${partyId}" />
+ <condition-expr field-name="partyIdTo" operator="equals"
+ value="${partyId}" />
+ </condition-list>
+ </condition-list>
+ <order-by field-name="-lastUpdatedStamp" />
+ </entity-condition>
+ <entity-condition entity-name="CommunicationEvent"
+ list-name="commEventsUnknown">
+ <condition-list combine="and">
+ <condition-expr field-name="statusId" operator="equals"
+ value="COM_UNKNOWN_PARTY" />
+ <condition-expr field-name="partyIdTo" operator="equals"
+ env-name="partyId" />
+ </condition-list>
+ <order-by field-name="-lastUpdatedStamp" />
+ </entity-condition>
+ <entity-one entity-name="PartyNameView" value-name="partyName">
<field-map field-name="partyId" env-name="partyId"/>
</entity-one>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
- navigation-menu-name="MyCommunicationsMenu" navigation-form-name="ListPartyCommEvents"
- name="myComms">
- <include-menu name="MyCommunicationsMenu"
- location="component://mypage/widget/MyPageMenus.xml" />
- <section>
- <condition>
- <not>
- <if-empty field-name="commEventsUnknown" />
- </not>
- </condition>
- <widgets>
- <label style="h2" text="Emails from unknown origin"></label>
- <include-form
- location="component://mypage/widget/MyPageForms.xml"
- name="ListMyUnknownPartyEmails" />
- </widgets>
- </section>
+ </actions>
+ <widgets>
+ <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+ navigation-menu-name="MyCommunicationsMenu" navigation-form-name="ListPartyCommEvents"
+ name="myComms">
+ <include-menu name="MyCommunicationsMenu"
+ location="component://mypage/widget/MyPageMenus.xml" />
+ <section>
+ <condition>
+ <not>
+ <if-empty field-name="commEventsUnknown" />
+ </not>
+ </condition>
+ <widgets>
+ <label style="h2" text="Emails from unknown origin"></label>
+ <include-form
+ location="component://mypage/widget/MyPageForms.xml"
+ name="ListMyUnknownPartyEmails" />
+ </widgets>
+ </section>
<label style="h2" text="Emails from known origin"></label>
- <include-form name="ListPartyCommEvents"
- location="component://mypage/widget/MyPageForms.xml" />
- </screenlet>
- </widgets>
- </section>
- </screen>
+ <include-form name="ListPartyCommEvents"
+ location="component://mypage/widget/MyPageForms.xml" />
+ </screenlet>
+ </widgets>
+ </section>
+ </screen>
<screen name="OtherCommunications">
<section>
<actions>
@@ -274,90 +274,90 @@
</widgets>
</section>
</screen>
- <screen name="ViewCommunicationEvent">
- <section>
- <widgets>
- <section>
- <condition>
- <if-compare field-name="parameters.type" operator="equals"
- value="main" />
- </condition>
- <actions>
- <set field="headerItem" value="main" />
- </actions>
- <widgets />
- </section>
- <section>
- <condition>
- <if-compare field-name="parameters.type" operator="equals"
- value="my" />
- </condition>
- <actions>
- <set field="headerItem" value="myCommunications" />
- </actions>
- <widgets />
- </section>
- <section>
- <condition>
- <if-compare field-name="parameters.type" operator="equals"
- value="other" />
- </condition>
- <actions>
- <set field="headerItem" value="otherCommunications" />
- </actions>
- <widgets />
- </section>
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewCommunication" />
- <set field="tabButtonItem" value="OverView" />
- <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
- <entity-one entity-name="CommunicationEvent"
- value-name="communicationEvent" />
- <entity-one entity-name="CommunicationEvent"
- value-name="parentEvent" auto-field-map="false">
- <field-map env-name="parentCommEventId" field-name="communicationEventId" />
- </entity-one>
- </actions>
- <widgets>
- <decorator-screen name="CommonCommunicationEventDecorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <or><!-- have for e-mails a special form -->
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="EMAIL_COMMUNICATION" />
- <if-compare field-name="communicationEvent.communicationEventTypeId"
- operator="equals" value="AUTO_EMAIL_COMM" />
- </or>
- </condition>
- <widgets>
- <section>
- <condition>
- <and>
- <if-empty field-name="communicationEvent.partyIdFrom" />
+ <!-- screen name="ViewCommunicationEvent">
+ <section>
+ <widgets>
+ <section>
+ <condition>
+ <if-compare field-name="parameters.type" operator="equals"
+ value="main" />
+ </condition>
+ <actions>
+ <set field="headerItem" value="main" />
+ </actions>
+ <widgets />
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="parameters.type" operator="equals"
+ value="my" />
+ </condition>
+ <actions>
+ <set field="headerItem" value="myCommunications" />
+ </actions>
+ <widgets />
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="parameters.type" operator="equals"
+ value="other" />
+ </condition>
+ <actions>
+ <set field="headerItem" value="otherCommunications" />
+ </actions>
+ <widgets />
+ </section>
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleViewCommunication" />
+ <set field="tabButtonItem" value="OverView" />
+ <set field="parentCommEventId" from-field="parameters.parentCommEventId" />
+ <entity-one entity-name="CommunicationEvent"
+ value-name="communicationEvent" />
+ <entity-one entity-name="CommunicationEvent"
+ value-name="parentEvent" auto-field-map="false">
+ <field-map env-name="parentCommEventId" field-name="communicationEventId" />
+ </entity-one>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonCommunicationEventDecorator"
+ location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <or><!-- have for e-mails a special form -->
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="EMAIL_COMMUNICATION" />
+ <if-compare field-name="communicationEvent.communicationEventTypeId"
+ operator="equals" value="AUTO_EMAIL_COMM" />
+ </or>
+ </condition>
+ <widgets>
+ <section>
+ <condition>
+ <and>
+ <if-empty field-name="communicationEvent.partyIdFrom" />
<if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_UNKNOWN_PARTY"/>
- </and>
- </condition>
- <widgets>
- <screenlet>
- <container>
- <label style="h1" text="Origin Email address not known!" />
- </container>
- <container>
- <label style="h2"
- text="Allocate this message to a existing or new party and add an email address" />
- </container>
- <include-form name="allocateMsgToPartyForm"
+ </and>
+ </condition>
+ <widgets>
+ <screenlet>
+ <container>
+ <label style="h1" text="Origin Email address not known!" />
+ </container>
+ <container>
+ <label style="h2"
+ text="Allocate this message to a existing or new party and add an email address" />
+ </container>
+ <include-form name="allocateMsgToPartyForm"
location="component://mypage/widget/MyPageForms.xml" />
- </screenlet>
- </widgets>
- </section>
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewEmail" />
- <section>
+ </screenlet>
+ </widgets>
+ </section>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewEmail" />
+ <section>
<actions>
<set field="entityName" value="CustRequestAndCommEvent"/>
<set field="requestParameters.communicationEventId" from-field="parameters.communicationEventId"/>
@@ -369,20 +369,20 @@
</screenlet>
</widgets>
</section>
- </widgets>
- <fail-widgets>
- <include-form
- location="component://party/webapp/partymgr/communication/CommForms.xml"
- name="ViewCommEvent" />
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
+ </widgets>
+ <fail-widgets>
+ <include-form
+ location="component://party/webapp/partymgr/communication/CommForms.xml"
+ name="ViewCommEvent" />
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </widgets>
+ </section>
+ </screen-->
</screens>