Author: mrisaliti
Date: Mon Jan 21 15:04:52 2008
New Revision: 614040
URL: http://svn.apache.org/viewvc?rev=614040&view=rev
Log:
Party Invitation 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/widget/partymgr/PartyInvitationForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?rev=614040&r1=614039&r2=614040&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Mon Jan 21
15:04:52 2008
@@ -73,6 +73,8 @@
OrderOrders=Orders
PageTitleAddIssuerProvisions=Add Issuer Provisions
PageTitleAddPartyContent=Add Party Content
+PageTitleAddPartyInvitationGroupAssoc=Add Party Invitation Group Assoc
+PageTitleAddPartyInvitationRoleAssoc=Add Party Invitation Role Assoc
PageTitleAddressMatchMap=Address Match Map
PageTitleAddressMatches=Address Matches
PageTitleCommEvents=Communication Events
@@ -755,4 +757,8 @@
FormFieldTitle_paPostalCode=Postal Code
FormFieldTitle_cmDetail=Contach Mech Detail
FormFieldTitle_parentCommEventId=Parent Comm Event Id
-FormFieldTitle_origCommEventId=Orig Comm Event Id
\ No newline at end of file
+FormFieldTitle_origCommEventId=Orig Comm Event Id
+FormFieldTitle_partyInvitationId=Party Invitation Id
+FormFieldTitle_emailAddress=Email Address
+FormFieldTitle_toName=To Name
+FormFieldTitle_lastInviteDate=Last Invite Date
\ 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=614040&r1=614039&r2=614040&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties Mon Jan
21 15:04:52 2008
@@ -67,6 +67,8 @@
OrderNewOrder=Nuovo Ordine
OrderOrders=Ordini
PageTitleAddIssuerProvisions=Aggiorni Fornitore di Certificati
+PageTitleAddPartyInvitationGroupAssoc=Aggiorna Gruppo Associazioni Inviti
Soggetto
+PageTitleAddPartyInvitationRoleAssoc=Aggiorna Ruolo Associazioni Inviti
Soggetto
PageTitleAddressMatchMap=Mappatura Uguaglianza Indirizzi
PageTitleAddressMatches=Indirizzo Uguali
PageTitleCommEvents=Comunicazione Eventi
@@ -105,6 +107,10 @@
PageTitleLogin=Login
PageTitleMain=Pagina Principale
PageTitleNewPartyNote=Nuova Nota Soggetto
+PageTitleFindPartyInvitation=Ricerca Inviti Soggetti
+PageTitlePartyInvitation=Invito Soggetto
+PageTitleEditPartyInvitationGroupAssoc=Aggiorna Associazione Gruppo Invito
+PageTitleEditPartyInvitationRoleAssoc=Aggiorna Associazione Ruolo Invito
PageTitlePendingCommunications=Comunicazioni Sospese
PageTitleSecurityGroupsList=Lista Gruppi Sicurezza
PageTitleShoppingList=Lista Acquisto
@@ -265,6 +271,7 @@
PartyFindCommunicationEvents=Ricerca Eventi Comunicazione
PartyFindParties=Ricerca Soggetti
PartyFindParty=Ricerca Soggetto
+PartyFindPartyInvitations=Ricerca Inviti Soggetto
PartyFirstName=Nome
PartyFirstNameMissing=Nome Mancante
PartyFollowSession=Segue Sessione
@@ -290,6 +297,15 @@
PartyInitialRequest=Iniziale Richiesta
PartyInitialUserAgent=Iniziale User Agent
PartyInvitation=Inviti Soggetti
+PartyInvitationGroupAssoc=Gruppo Associazione Inviti
+PartyInvitationGroupAssocPartyIdTo=Soggetto A
+PartyInvitationRoleAssoc=Ruolo Associazione Inviti
+PartyInvitationLastInviteDate=Ultima Data Invito
+PartyInvitationNewPartyInvitation=Nuovo Soggetto Invito
+PartyInvitationPartyInvitationId=Invito Soggetto
+PartyInvitationAccAndDecPermissionError=Tu non sei autorizzato ad accettare o
declinare Inviti Soggetti
+PartyInvitationCancelPermissionError=Tu non sei autorizzato a cancellare
Inviti Soggetti
+PartyInvitationNotValidError=Questo non \u00e8 un\'Invito Soggetto valido
PartyLastName=Cognome
PartyLastNameMissingError=Cognome Mancante
PartyLastVisit=Ultima Visita(e)
@@ -698,4 +714,8 @@
FormFieldTitle_paPostalCode=C.A.P.
FormFieldTitle_cmDetail=Dettagli Contatto
FormFieldTitle_parentCommEventId=Evento Comunicazione Padre
-FormFieldTitle_origCommEventId=Evento Comunicazione Origine
\ No newline at end of file
+FormFieldTitle_origCommEventId=Evento Comunicazione Origine
+FormFieldTitle_partyInvitationId=Invito Soggetto
+FormFieldTitle_emailAddress=Indirizzo Email
+FormFieldTitle_toName=Al Nome
+FormFieldTitle_lastInviteDate=Data Ultimo Invito
\ No newline at end of file
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=614040&r1=614039&r2=614040&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Mon
Jan 21 15:04:52 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -57,9 +57,9 @@
<field name="toName"
title="${uiLabelMap.PartyToName}"><display/></field>
<field name="emailAddress"
title="${uiLabelMap.PartyEmailAddress}"><display/></field>
<field name="statusId"><display-entity entity-name="StatusItem"
description="${description}"/></field>
- <field name="lastInviteDate"
title="${uiLabelMap.PartyInvitationLastInviteDate}"><display/></field>
+ <field name="lastInviteDate"><display/></field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink
target="deletePartyInvitation?partyInvitationId=${partyInvitationId}"
description="delete"></hyperlink>
+ <hyperlink
target="deletePartyInvitation?partyInvitationId=${partyInvitationId}"
description="${UiLabelMap.CommonDelete}"></hyperlink>
</field>
</form>
@@ -103,7 +103,7 @@
</display-entity>
</field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink
target="deletePartyInvitationGroupAssoc?partyInvitationId=${partyInvitationId}&partyIdTo=${partyIdTo}"
description="delete"></hyperlink>
+ <hyperlink
target="deletePartyInvitationGroupAssoc?partyInvitationId=${partyInvitationId}&partyIdTo=${partyIdTo}"
description="${UiLabelMap.CommonDelete}"></hyperlink>
</field>
</form>
@@ -135,7 +135,7 @@
</field>
<field name="roleTypeId"
title="${uiLabelMap.PartyRoleTypeId}"><display-entity
entity-name="RoleType"/></field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink
target="deletePartyInvitationRoleAssoc?partyInvitationId=${partyInvitationId}&roleTypeId=${roleTypeId}"
description="delete"></hyperlink>
+ <hyperlink
target="deletePartyInvitationRoleAssoc?partyInvitationId=${partyInvitationId}&roleTypeId=${roleTypeId}"
description="${UiLabelMap.CommonDelete}"></hyperlink>
</field>
</form>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=614040&r1=614039&r2=614040&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
Mon Jan 21 15:04:52 2008
@@ -71,9 +71,21 @@
<if-has-permission permission="PARTYMGR"
action="_VIEW"/>
</condition>
<widgets>
- <container><label
style="head1">${uiLabelMap.${titleProperty}}</label></container>
- <container style="button-bar"><link
target="/editPartyInvitation"
text="${uiLabelMap.PartyInvitationNewPartyInvitation}"
style="buttontext"/></container>
- <include-form name="FindPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.${titleProperty}}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container
style="button-bar"><link target="/editPartyInvitation"
text="${uiLabelMap.PartyInvitationNewPartyInvitation}"
style="buttontext"/></container>
+ <include-form
name="FindPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label
style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -84,7 +96,20 @@
<if-compare
field-name="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="ListPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.${titleProperty}}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="ListPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
</section>
</decorator-section>
@@ -107,9 +132,21 @@
<if-has-permission permission="PARTYMGR"
action="_VIEW"/>
</condition>
<widgets>
- <container><label
style="head1">${uiLabelMap.${titleProperty}}</label></container>
- <container style="button-bar"><link
target="/editPartyInvitation"
text="${uiLabelMap.PartyInvitationNewPartyInvitation}"
style="buttontext"/></container>
- <include-form name="ListPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.${titleProperty}}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container
style="button-bar"><link target="/editPartyInvitation"
text="${uiLabelMap.PartyInvitationNewPartyInvitation}"
style="buttontext"/></container>
+ <include-form
name="ListPartyInvitations"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</widgets>
<fail-widgets>
<label
style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -133,7 +170,20 @@
<widgets>
<decorator-screen name="CommonPartyInvitationDecorator">
<decorator-section name="body">
- <include-form name="EditPartyInvitation"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.PageTitlePartyInvitation}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="EditPartyInvitation"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -150,8 +200,34 @@
<widgets>
<decorator-screen name="CommonPartyInvitationDecorator">
<decorator-section name="body">
- <include-form name="ListPartyInvitationGroupAssocs"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
- <include-form name="AddPartyInvitationGroupAssoc"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.PageTitleEditPartyInvitationGroupAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="ListPartyInvitationGroupAssocs"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.PageTitleAddPartyInvitationGroupAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="AddPartyInvitationGroupAssoc"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -168,11 +244,37 @@
<widgets>
<decorator-screen name="CommonPartyInvitationDecorator">
<decorator-section name="body">
- <include-form name="ListPartyInvitationRoleAssocs"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
- <include-form name="AddPartyInvitationRoleAssoc"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.PageTitleEditPartyInvitationRoleAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="ListPartyInvitationRoleAssocs"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label
text="${uiLabelMap.PageTitleAddPartyInvitationRoleAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="AddPartyInvitationRoleAssoc"
location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=614040&r1=614039&r2=614040&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Mon Jan 21
15:04:52 2008
@@ -81,8 +81,8 @@
</menu-item>
</menu>
- <menu name="PartyInvitationTabBar" default-selected-style="selected"
type="simple"
- menu-container-style="button-bar button-style-1"
selected-menuitem-context-field-name="tabButtonItem">
+ <menu name="PartyInvitationTabBar" default-selected-style="selected"
type="simple"
+ menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="EditPartyInvitation"
title="${uiLabelMap.PartyInvitation}">
<link
target="editPartyInvitation?partyInvitationId=${partyInvitationId}"/>
</menu-item>
@@ -93,5 +93,4 @@
<link
target="PartyInvitationRoleAssocs?partyInvitationId=${partyInvitationId}"/>
</menu-item>
</menu>
-
-</menus>
+</menus>
\ No newline at end of file
