svn commit: r667016 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: ashish
Date: Thu Jun 12 02:41:59 2008 New Revision: 667016 URL: http://svn.apache.org/viewvc?rev=667016&view=rev Log: Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839. Container to Screenlet conversion is done on Party component. Thanks Awdesh Singh Parihar for your patch. Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Jun 12 02:41:59 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 @@ -1123,6 +1123,12 @@ <value xml:lang="it">Aggiorna Ruolo Associazioni Inviti Soggetto</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸ªà¸à¸²à¸à¸°à¸à¸²à¸£à¹à¸à¸´à¸à¸à¸§à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> </property> + <property key="PageTitleAddPartyTaxAuthInfos"> + <value xml:lang="en">Add Party Tax Authority Info</value> + </property> + <property key="PageTitleAddPartySegmentRoles"> + <value xml:lang="en">Add Party Segment Role</value> + </property> <property key="PageTitleAddressMatchMap"> <value xml:lang="en">Address Match Map</value> <value xml:lang="it">Mappatura Uguaglianza Indirizzi</value> @@ -1141,11 +1147,6 @@ <value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¹à¸«à¸¡à¸·à¸à¸à¸à¸±à¸</value> <value xml:lang="zh">å°åå¹é </value> </property> - <property key="PageTitleChildCommunicationEvents"> - <value xml:lang="en">Child Communication events</value> - <value xml:lang="it">Eventi Comunicazione Figli</value> - <value xml:lang="th">à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£à¸à¸±à¸à¹à¸à¹à¸</value> - </property> <property key="PageTitleCommEvents"> <value xml:lang="en">Communication Events</value> <value xml:lang="es">Eventos de comunicación</value> @@ -1292,16 +1293,6 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¹à¸à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ç¼è¾åç±»ç»ä¼å</value> </property> - <property key="PageTitleEditPartyInvitationGroupAssoc"> - <value xml:lang="en">Edit Party Invitation GroupAssoc</value> - <value xml:lang="it">Aggiorna Associazione Gruppo Invito</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¹à¸à¸´à¸à¸à¸§à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PageTitleEditPartyInvitationRoleAssoc"> - <value xml:lang="en">Edit Party Invitation RoleAssoc</value> - <value xml:lang="it">Aggiorna Associazione Ruolo Invito</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸à¸²à¸à¸°à¸à¸²à¸£à¹à¸à¸´à¸à¸à¸§à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> <property key="PageTitleEditPartyRates"> <value xml:lang="en">Edit Party Rates</value> <value xml:lang="es">Editar tasas de participación</value> @@ -1323,16 +1314,6 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸§à¸²à¸¡à¸ªà¸±à¸¡à¸à¸±à¸à¸à¹à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ç¼è¾ä¼åå ³ç³»</value> </property> - <property key="PageTitleEditPartyTaxAuthInfos"> - <value xml:lang="en">Edit Party Tax Authority Info</value> - <value xml:lang="es">Editar información de impuestos</value> - <value xml:lang="it">Aggiorna Informazioni Autorità Tasse Soggetto</value> - <value xml:lang="nl">Wijzig BTW informatie</value> - <value xml:lang="ro">Actualizare Informatii Taxe Autoritati Subiect</value> - <value xml:lang="ru">ÐзмениÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ налоговом оÑгане ÑÑаÑÑника</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹à¸ªà¸µà¸¢à¸ าษีà¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - <value xml:lang="zh">ç¼è¾ä¼åç¨å¡æºå ³ä¿¡æ¯</value> - </property> <property key="PageTitleEditPersonalInformation"> <value xml:lang="en">Edit Personal Information</value> <value xml:lang="es">Editar información personal</value> @@ -1368,18 +1349,6 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> <value xml:lang="zh">ç¼è¾å®å ¨ç»æé</value> </property> - <property key="PageTitleEditSecurityGroupUserLogins"> - <value xml:lang="en">Edit Security Group UserLogins</value> - <value xml:lang="es">Editar grupo de ususario</value> - <value xml:lang="fr">Ãdition utilisateurs groupe de sécurité</value> - <value xml:lang="it">Aggiorna Gruppo Sicurezza Utente</value> - <value xml:lang="nl">Wijzig rechten users</value> - <value xml:lang="pt_PT">Editar InÃcios Dos Utilizadores De Segurança</value> - <value xml:lang="ro">Actualizare Grup Siguranta Utilizator</value> - <value xml:lang="ru">ÐзмениÑÑ Ð¸Ð¼ÐµÐ½Ð° полÑзоваÑелей гÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸à¸à¸à¸¹à¹à¹à¸à¹à¸²à¹à¸à¹à¸£à¸°à¸à¸</value> - <value xml:lang="zh">ç¼è¾å®å ¨ç»ç¨æ·ç»å½</value> - </property> <property key="PageTitleEditUserLoginSecurityGroups"> <value xml:lang="en">Edit UserLogin Security Groups</value> <value xml:lang="es">Editar grupos de seguridad</value> @@ -1637,16 +1606,6 @@ <value xml:lang="th">à¹à¸ªà¸à¸à¸ªà¸à¸²à¸à¸°à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">æµè§ä¼åè§è²</value> </property> - <property key="PageTitleViewPartySegmentRoles"> - <value xml:lang="en">View Party Segment Roles</value> - <value xml:lang="es">Ver segmento de roles</value> - <value xml:lang="it">Mostra Ruoli Segmento Soggetto</value> - <value xml:lang="nl">View Party Segment Roles</value> - <value xml:lang="ro">Afisare Roluri Segment Subiect</value> - <value xml:lang="ru">ÐÑоÑмоÑÑеÑÑ Ñоли ÑÑаÑÑника в ÑегменÑе</value> - <value xml:lang="th">à¹à¸ªà¸à¸à¸ªà¸à¸²à¸à¸°à¹à¸à¸ªà¹à¸§à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - <value xml:lang="zh">æµè§ä¼åååºè§è²</value> - </property> <property key="PageTitleViewVendorParty"> <value xml:lang="en">View Vendor Party Info</value> <value xml:lang="es">Ver información de vendedor</value> 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=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jun 12 02:41:59 2008 @@ -352,7 +352,7 @@ </form> <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="CommunicationEvent"> <condition-list combine="or"> Modified: ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml Thu Jun 12 02:41:59 2008 @@ -20,7 +20,7 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="ListPartyContactLists" type="list" target="updateContactListParty" - separate-columns="false" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + separate-columns="false" header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="ContactListParty"> <field-map field-name="partyId"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu Jun 12 02:41:59 2008 @@ -255,7 +255,7 @@ </form> <form name="UpdatePartyTaxAuthInfo" type="list" list-name="partyTaxInfos" target="updatePartyTaxAuthInfo" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updatePartyTaxAuthInfo"/> <field name="partyId"><hidden/></field> <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="[${geoId}] ${geoName}" also-hidden="true"/></field> @@ -311,7 +311,7 @@ </form> <form name="ListPartyRates" type="list" list-name="partyTaxInfos" target="updatePartyRate" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartyRate"> <condition-expr field-name="partyId" env-name="partyId"/> @@ -400,7 +400,7 @@ </form> <form name="ListSegmentRoles" type="list" target="updateSegmentGroupRole" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupRole"> <field-map field-name="partyId" /> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jun 12 02:41:59 2008 @@ -321,64 +321,16 @@ <if-compare field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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> + <screenlet id="CommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/> + </screenlet> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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> + <screenlet id="PartyNewCommunicationPanel" title="${uiLabelMap.PartyNewCommunication}" collapsible="true"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/> + </screenlet> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> </fail-widgets> </section> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Thu Jun 12 02:41:59 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="ListPartyClassifications" type="list" target="updatePartyClassification" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="PartyClassification"> <field-map field-name="partyId"/> @@ -108,7 +108,7 @@ </form> <form name="ListPartyClassificationGroupParties" type="list" target="updatePartyClassificationParty" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="PartyClassification"> <field-map field-name="partyClassificationGroupId"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Thu Jun 12 02:41:59 2008 @@ -36,34 +36,10 @@ <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyClassifications}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPartyClassifications" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyClassifications}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddPartyClassification" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="PartyClassificationPanel" title="${uiLabelMap.PartyClassifications}" collapsible="true"> + <include-form name="AddPartyClassification" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> + </screenlet> + <include-form name="ListPartyClassifications" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -95,34 +71,10 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyClassificationGroups}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyClassificationGroups}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="PartyClassificationGroupPartiesPanel" title="${uiLabelMap.PartyClassificationGroups}" collapsible="true"> + <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> + </screenlet> + <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Thu Jun 12 02:41:59 2008 @@ -37,34 +37,10 @@ <if-has-permission action="_VIEW" permission="PARTYMGR"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyContactList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListPartyContactLists"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyContactListPartyCreate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="AddPartyContactList"/> - </widgets> - </section> - </container> - </container> + <screenlet id="PartyContactListPanel" title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true"> + <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="AddPartyContactList"/> + </screenlet> + <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListPartyContactLists"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml Thu Jun 12 02:41:59 2008 @@ -193,41 +193,17 @@ <screen name="EditPartyInvitationsGroupAssocs"> <section> <actions> - <set field="titleProperty" value="PageTitleEditPartyInvitationGroupAssoc"/> + <set field="titleProperty" value="PageTitleAddPartyInvitationGroupAssoc"/> <set field="tabButtonItem" value="PartyInvitationGroupAssocs"/> <set field="partyInvitationId" from-field="parameters.partyInvitationId"/> </actions> <widgets> <decorator-screen name="CommonPartyInvitationDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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="h3"> - <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> + <screenlet id="PartyInvitationsGroupAssocsPanel" title="${uiLabelMap.PageTitleAddPartyInvitationGroupAssoc}" collapsible="true"> + <include-form name="AddPartyInvitationGroupAssoc" location="component://party/widget/partymgr/PartyInvitationForms.xml"/> + </screenlet> + <include-form name="ListPartyInvitationGroupAssocs" location="component://party/widget/partymgr/PartyInvitationForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -237,41 +213,17 @@ <screen name="EditPartyInvitationsRoleAssocs"> <section> <actions> - <set field="titleProperty" value="PageTitleEditPartyInvitationRoleAssoc"/> + <set field="titleProperty" value="PageTitleAddPartyInvitationRoleAssoc"/> <set field="tabButtonItem" value="PartyInvitationRoleAssocs"/> <set field="partyInvitationId" from-field="parameters.partyInvitationId"/> </actions> <widgets> <decorator-screen name="CommonPartyInvitationDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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="h3"> - <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> + <screenlet id="PartyInvitationRoleAssocsPanel" title="${uiLabelMap.PageTitleAddPartyInvitationRoleAssoc}" collapsible="true"> + <include-form name="AddPartyInvitationRoleAssoc" location="component://party/widget/partymgr/PartyInvitationForms.xml"/> + </screenlet> + <include-form name="ListPartyInvitationRoleAssocs" location="component://party/widget/partymgr/PartyInvitationForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Thu Jun 12 02:41:59 2008 @@ -86,7 +86,7 @@ <!-- SecurityGroupUserLogin --> <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="UserLoginAndSecurityGroup"> <condition-expr field-name="groupId" env-name="groupId"/> @@ -117,7 +117,7 @@ </form> <form name="ListUserLoginSecurityGroups" type="list" extends="ListSecurityGroupUserLogins" - list-name="userLoginSecurityGroups" target="userLogin_updateUserLoginToSecurityGroup" + list-name="userLoginSecurityGroups" header-row-style="header-row-2" target="userLogin_updateUserLoginToSecurityGroup" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="UserLoginAndSecurityGroup"> Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml?rev=667016&r1=667015&r2=667016&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Thu Jun 12 02:41:59 2008 @@ -162,7 +162,7 @@ <screen name="EditSecurityGroupUserLogins"> <section> <actions> - <set field="titleProperty" value="PageTitleEditSecurityGroupUserLogins"/> + <set field="titleProperty" value="PartyAddUserLoginToSecurityGroup"/> <set field="tabButtonItem" value="EditSecurityGroupUserLogins"/> <set field="labelTitleProperty" value="PartyUserLoginsForSecurityGroup"/> @@ -172,34 +172,10 @@ <widgets> <decorator-screen name="SecurityGroupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditSecurityGroupUserLogins}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListSecurityGroupUserLogins" location="component://party/widget/partymgr/SecurityForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PartyAddUserLoginToSecurityGroup}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddSecurityGroupUserLogin" location="component://party/widget/partymgr/SecurityForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="SecurityGroupUserLoginsPanel" title="${uiLabelMap.PartyAddUserLoginToSecurityGroup}" collapsible="true"> + <include-form name="AddSecurityGroupUserLogin" location="component://party/widget/partymgr/SecurityForms.xml"/> + </screenlet> + <include-form name="ListSecurityGroupUserLogins" location="component://party/widget/partymgr/SecurityForms.xml"/> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |