OFBiz › OFBiz - Commits

svn commit: r614018 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.properties config/PartyUiLabels_it.properties webapp/partymgr/communication/CommForms.xml webapp/partymgr/communication/CommMenus.xml widget/partymgr/CommunicationScreens.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r614018 - in /ofbiz/trunk/applications/party: config/PartyUiLabels.properties config/PartyUiLabels_it.properties webapp/partymgr/communication/CommForms.xml webapp/partymgr/communication/CommMenus.xml widget/partymgr/CommunicationScreens.xml

Author: mrisaliti
Date: Mon Jan 21 13:33:45 2008
New Revision: 614018

URL: http://svn.apache.org/viewvc?rev=614018&view=rev
Log:
Communications forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1583)

Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.properties
ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?rev=614018&r1=614017&r2=614018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Mon Jan 21 13:33:45 2008
@@ -753,4 +753,6 @@
FormFieldTitle_paAddress1=Address 1
FormFieldTitle_paAddress2=Address 2
FormFieldTitle_paPostalCode=Postal Code
-FormFieldTitle_cmDetail=Contach Mech Detail
\ No newline at end of file
+FormFieldTitle_cmDetail=Contach Mech Detail
+FormFieldTitle_parentCommEventId=Parent Comm Event Id
+FormFieldTitle_origCommEventId=Orig Comm Event Id
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties?rev=614018&r1=614017&r2=614018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties Mon Jan 21 13:33:45 2008
@@ -33,9 +33,9 @@
AccountingPaymentsSent=Pagamenti Inviati

commeventservices.communication_event_not_found_failure=ERRORE: Evento Comunicazioni non trovato per l'evento comunicazione con codice evento
-commeventservices.communication_event_must_be_email_for_email=ERRORE: Evento Comunicazioni non \u00e8 un email communication e non pu essere emailed per il codice evento comunicazioni
-commeventservices.communication_event_from_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech da che \u00e8 un codice evento comunicazione email
-commeventservices.communication_event_to_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech che \u00e8 un email per il codice evento comunicazioni
+commeventservices.communication_event_must_be_email_for_email=ERRORE: Evento Comunicazioni non \u00e8 un email communication e non pu essere emailed per l'evento comunicazioni
+commeventservices.communication_event_from_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech da che \u00e8 un'evento comunicazione email
+commeventservices.communication_event_to_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech che \u00e8 un email per l'evento comunicazioni

contactmechservices.could_not_create_contact_info_id_generation_failure=ERRORE: Non \u00e8 possibile creare informazioni contatto (generazione Codice fallito).
contactmechservices.service_createContactMech_not_be_used_for_POSTAL_ADDRESS=Questo servizio (createContactMech) non dovrebbe essere usato per il tipo POSTAL_ADDRESS ContactMechs, usare il servizio createPostalAddress.
@@ -71,6 +71,7 @@
PageTitleAddressMatches=Indirizzo Uguali
PageTitleCommEvents=Comunicazione Eventi
PageTitleCreateNewPartyDetail=Creare Nuovo Dettaglio Soggetto
+PageTitleChildCommunicationEvents=Eventi Comunicazione Figli
PageTitleEditAvsOverride=Aggiorna Sovrapposizioni AVS
PageTitleEditCommContent=Aggiorna Contenuto Comunicazione
PageTitleEditCommunication=Aggiorna Comunicazione
@@ -645,7 +646,7 @@
FormFieldTitle_partyClassificationTypeId=Tipo Classificazione Soggetto
FormFieldTitle_partyClassificationGroupId=Codice Gruppo Classificazione Soggetto
FormFieldTitle_parentGroupId=Codice Gruppo Padre
-FormFieldTitle_communicationEventId=Codice Evento Comunicazione
+FormFieldTitle_communicationEventId=Evento Comunicazione
FormFieldTitle_custRequestId=Codice Richiesta Soggetto
FormFieldTitle_preferredContactMechId=Codice Contatto Preferito
FormFieldTitle_statusHistory=Storia Stato
@@ -693,4 +694,6 @@
FormFieldTitle_paAddress1=Indirizzo 1
FormFieldTitle_paAddress2=Indirizzo 2
FormFieldTitle_paPostalCode=C.A.P.
-FormFieldTitle_cmDetail=Dettagli Contatto
\ No newline at end of file
+FormFieldTitle_cmDetail=Dettagli Contatto
+FormFieldTitle_parentCommEventId=Evento Comunicazione Padre
+FormFieldTitle_origCommEventId=Evento Comunicazione Origine
\ No newline at end of file

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=614018&r1=614017&r2=614018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Mon Jan 21 13:33:45 2008
@@ -41,7 +41,8 @@
<field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field>
</form-->

- <form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent">
+ <form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent"
+ header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
<field-map field-name="statusId" env-name="communicationEvent.statusId"/>
@@ -208,7 +209,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
</form>

- <form name="ViewCommEvent" type="single" default-map-name="communicationEvent">
+ <form name="ViewCommEvent" type="single" default-map-name="communicationEvent"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${partyIdFrom}" description="[${partyIdFrom}]"/></display-entity></field>
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName}"><sub-hyperlink target="viewprofile?partyId=${communicationEvent.partyIdTo}" description="[${communicationEvent.partyIdTo}]"/></display-entity></field>
@@ -242,18 +244,18 @@
</field>
</form>

- <form name="findCommEvents" type="single" target="ListLookupCommEvents"
- paginate="true">
+ <form name="findCommEvents" type="single" target="ListLookupCommEvents" paginate="true"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId" use-when="communicationEvent != null"><text-find/></field>
<field name="parentCommEventId"><text-find/></field>
<field name="origCommEventId"><text-find/></field>
<field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
<field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="communicationEventTypeId">
+ <field name="communicationEventTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/>
- </drop-down>
- </field>
+ </drop-down>
+ </field>
<field name="statusId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
@@ -288,7 +290,7 @@
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>

- <form name="ListCommEvents" type="list">
+ <form name="ListCommEvents" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="communicationEventId" widget-style="smallSubmit">
<hyperlink description="${communicationEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="intra-app"/>
</field>
@@ -309,7 +311,7 @@
<field map-name="subjectMap" name="subject"><display/></field>
</form>

- <form name="ListPartyCommEvents" type="list" extends="ListCommEvents">
+ <form name="ListPartyCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="CommunicationEvent">
<condition-list combine="or">
@@ -326,7 +328,7 @@
</field>
</form>

- <form name="ListPendingCommEvents" type="list" extends="ListCommEvents">
+ <form name="ListPendingCommEvents" type="list" extends="ListCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="CommunicationEvent">
<condition-list combine="and">
@@ -340,7 +342,8 @@
</actions>
</form>

- <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent">
+ <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="CommunicationEvent">
<condition-list combine="or">
@@ -352,7 +355,7 @@
</form>

<form name="ListLookupCommEvents" type="list" list-name="listIt" extends="ListCommEvents" target="updateCommunicationEvent"
- paginate-target="ListLookupCommEvents">
+ paginate-target="ListLookupCommEvents" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
<field-map env-name="parameters" field-name="inputFields"/>
@@ -365,7 +368,8 @@
</field>
</form>

- <form name="ListCommWorkEfforts" type="list" paginate-target="ListCommWorkEfforts">
+ <form name="ListCommWorkEfforts" type="list" paginate-target="ListCommWorkEfforts"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CommunicationEventWorkEff" use-cache="false">
<field-map field-name="communicationEventId"/>
@@ -381,7 +385,8 @@

<form name="AddCommEventWorkEffort" type="single" extends="EditWorkEffort"
extends-resource="component://workeffort/widget/WorkEffortForms.xml"
- target="/partymgr/control/createCommEventWorkEffort" target-type="inter-app">
+ target="/partymgr/control/createCommEventWorkEffort" target-type="inter-app"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><display/></field>
<field name="workEffortId" use-when="workEffort==null&&workEffortId==null" ><lookup target-form-name="/workeffort/control/LookupWorkEffort"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/> </field>
@@ -393,7 +398,8 @@
</sort-order>
</form>

- <form name="ListCommPurposes" type="list" paginate-target="UpdateCommPurposes">
+ <form name="ListCommPurposes" type="list" paginate-target="UpdateCommPurposes"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CommunicationEventPurpose" use-cache="true">
<field-map field-name="communicationEventId"/>
@@ -407,7 +413,8 @@
</field>
</form>

- <form name="AddEventPurpose" type="single" target="createCommunicationEventPurpose">
+ <form name="AddEventPurpose" type="single" target="createCommunicationEventPurpose"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><hidden/></field>
<field name="partyId"><hidden/></field>
<field name="communicationEventPrpTypId" >
@@ -420,7 +427,8 @@
<field name="submitButton" title="${uiLabelMap.PartyAddPurpose}"><submit button-type="button"/></field>
</form>

- <form name="ListCommRoles" type="list" paginate-target="UpdateCommRoles">
+ <form name="ListCommRoles" type="list" paginate-target="UpdateCommRoles"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CommunicationEventRole" use-cache="true">
<field-map field-name="communicationEventId"/>
@@ -437,7 +445,8 @@
</field>
</form>

- <form name="AddEventRole" type="single" target="createCommunicationEventRole">
+ <form name="AddEventRole" type="single" target="createCommunicationEventRole"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId" >
@@ -451,7 +460,7 @@
</form>

<form name="listCommContent" type="list" list-name="contentDataResourceList"
- paginate-target="/ListCommContent" view-size="20">
+ paginate-target="/ListCommContent" view-size="20" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CommEventContentDataResource" list-name="contentDataResourceList">
<field-map field-name="communicationEventId"/>
@@ -470,7 +479,8 @@
<field name="dataResourceId"><display/></field>
</form>

- <form name="addCommContent" type="single" target="createCommContentDataResource">
+ <form name="addCommContent" type="single" target="createCommContentDataResource"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><hidden/></field>
<field name="contentId"><ignored/></field>
<field name="contentName"><text/></field>
@@ -497,7 +507,8 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>

- <form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource">
+ <form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"><display/></field>
<field name="contentId"><display/></field>
<field name="dataResourceId"><display/></field>
@@ -571,7 +582,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit/></field>
</form>

- <form name="editCommTextContent" type="single" target="uploadCommEventContent" default-map-name="commEventContentDataResource">
+ <form name="editCommTextContent" type="single" target="uploadCommEventContent" default-map-name="commEventContentDataResource"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="contentId" ><hidden/></field>
<field name="drDataResourceId" ><hidden/></field>
<field name="drDataResourceTypeId" ><hidden/></field>
@@ -581,5 +593,4 @@
<field name="textData" map-name="electronicText" title="Text Data"><textarea rows="30" cols="60"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
-
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=614018&r1=614017&r2=614018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Mon Jan 21 13:33:45 2008
@@ -18,7 +18,8 @@
under the License.
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
- <menu name="CommEventTabBar" type="simple" selected-menuitem-context-field-name="subTabButtonItem">
+ <menu name="CommEventTabBar" default-selected-style="selected" type="simple"
+ menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="subTabButtonItem">
<menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
<link target="EditCommunicationEvent?partyId=${partyId}&communicationEventId=${communicationEventId}"/>
</menu-item>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=614018&r1=614017&r2=614018&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Mon Jan 21 13:33:45 2008
@@ -84,9 +84,21 @@
<if-has-permission action="_VIEW" permission="PARTYMGR"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyFoundCommunicationEvents}"/></container>
- <container><link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyFoundCommunicationEvents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/></container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -128,12 +140,24 @@
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
- <container><label style="head1" text="${uiLabelMap.PartyFoundCommunicationEvents}"/></container>
- <container style="button-bar">
- <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/>
- <link style="smallSubmit" target="FindCommunicationEvents" text="${uiLabelMap.PartyNewFind}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyFoundCommunicationEvents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/>
+ <link style="smallSubmit" target="FindCommunicationEvents" text="${uiLabelMap.PartyNewFind}"/>
+ </container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -171,9 +195,21 @@
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
- <container><label style="head1" text="${uiLabelMap.PartyFindCommunicationEvents}"/></container>
- <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyFindCommunicationEvents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -275,17 +311,6 @@
<section>
<widgets>
<section>
- <condition>
- <not><if-empty field-name="communicationEvent"/></not>
- </condition>
- <widgets>
- <label style="head1" text="${uiLabelMap.PartyEditCommunicationEvent}"/>
- </widgets>
- <fail-widgets>
- <label style="head1" text="${uiLabelMap.PartyNewCommunication}"/>
- </fail-widgets>
- </section>
- <section>
<widgets>
<container>
<link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/>
@@ -299,21 +324,63 @@
<if-compare field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/>
</condition>
<widgets>
- <container style="widget-container">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyEditCommunicationEvent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <label style="head1" text="${uiLabelMap.PageTitleChildCommunicationEvents}"></label>
- <container style="widget-container">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleChildCommunicationEvents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
+ </widgets>
+ </section>
+ </container>
</container>
</widgets>
<fail-widgets>
- <container style="widget-container">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyNewCommunication}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <label style="head1" text="${uiLabelMap.PageTitleChildCommunicationEvents}"></label>
- <container style="widget-container">
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleChildCommunicationEvents}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/>
+ </widgets>
+ </section>
+ </container>
</container>
</fail-widgets>
</section>
@@ -348,15 +415,39 @@
<decorator-section name="body">
<section>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyCommEventRoles}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommRoles"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommEventRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommRoles"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyNewCommRole}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyNewCommRole}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventRole"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
</widgets>
@@ -390,15 +481,39 @@
<decorator-section name="body">
<section>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyCommEventPurposes}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommPurposes"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommEventPurposes}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommPurposes"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyNewCommPurpose}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventPurpose"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyNewCommPurpose}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddEventPurpose"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
</widgets>
@@ -426,7 +541,6 @@
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.PartyCommWorkEfforts}"/></container>
<section>
<condition>
<if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
@@ -435,7 +549,20 @@
<container><link style="smallSubmit" target="AddCommEventWorkEffort?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyNewCommWorkEffort}"/></container>
</widgets>
</section>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommWorkEfforts"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommWorkEfforts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommWorkEfforts"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -456,8 +583,20 @@
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.PartyCommWorkEfforts}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommWorkEfforts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -476,8 +615,20 @@
<widgets>
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.PartyCommWorkEfforts}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommWorkEfforts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -506,7 +657,6 @@
<if-has-permission action="_VIEW" permission="PARTYMGR"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyCommContent}"/></container>
<section>
<condition>
<if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
@@ -515,7 +665,20 @@
<container><link style="smallSubmit" target="AddCommContent?communicationEventId=${communicationEventId}&partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container>
</widgets>
</section>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyCommContent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -548,8 +711,20 @@
<if-has-permission action="_VIEW" permission="PARTYMGR"/>
</condition>
<widgets>
- <container><label style="head1" text="${uiLabelMap.PartyNewCommContent}"/></container>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="addCommContent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyNewCommContent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="addCommContent"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -595,12 +770,20 @@
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
</widgets>
</section>
- <container><label style="head1" text="${uiLabelMap.PageTitleEditCommContent}"/></container>
- 
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditCommContent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
<section>
<condition>
<if-regexp expr="text.*" field-name="commEventContentDataResource.drMimeTypeId" />
@@ -611,7 +794,20 @@
</entity-one>
</actions>
<widgets>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommTextContent"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditCommContent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommTextContent"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
<section>
@@ -621,9 +817,22 @@
</not>
</condition>
<widgets>
- <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadCommContent"/>
- <label text="${uiLabelMap.PartyViewImage}" style="head1"/>
- <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyViewImage}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadCommContent"/>
+ <label text="${uiLabelMap.PartyViewImage}" style="head1"/>
+ <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
</widgets>