You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/17 11:07:20 UTC
svn commit: r826204 - in /ofbiz/trunk/applications/party/widget/partymgr:
CommunicationEventScreens.xml PartyClassificationScreens.xml
PartyInvitationScreens.xml PartyScreens.xml PaymentMethodScreens.xml
ProfileScreens.xml SecurityScreens.xml
Author: buscob
Date: Sat Oct 17 09:07:19 2009
New Revision: 826204
URL: http://svn.apache.org/viewvc?rev=826204&view=rev
Log:
Changed <container style="screenlet"> pattern to <screenlet...>.
Modified:
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Oct 17 09:07:19 2009
@@ -809,20 +809,9 @@
</entity-one>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditCommContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="editCommTextContent"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditCommContent}">
+ <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="editCommTextContent"/>
+ </screenlet>
</widgets>
</section>
<section>
@@ -832,22 +821,11 @@
</not>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyViewImage}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="uploadCommContent"/>
- <label text="${uiLabelMap.PartyViewImage}" style="h1"/>
- <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyViewImage}">
+ <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="uploadCommContent"/>
+ <label text="${uiLabelMap.PartyViewImage}" style="h1"/>
+ <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/>
+ </screenlet>
</widgets>
</section>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sat Oct 17 09:07:19 2009
@@ -97,23 +97,12 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyClassificationGroups}"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyClassificationGroups}">
+ <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"/></container>
<container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"/></container>
- <container style="screenlet-body">
- <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
- </container>
- </widgets>
- </section>
+ <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
</container>
- </container>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -146,20 +135,9 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyClassificationGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyClassificationGroup}">
+ <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml Sat Oct 17 09:07:19 2009
@@ -109,21 +109,10 @@
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <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>
+ <screenlet title="${uiLabelMap[titleProperty]}}">
+ <container style="button-bar"><link target="/editPartyInvitation" text="${uiLabelMap.PartyInvitationNewPartyInvitation}" style="buttontext"/></container>
+ <include-form name="ListPartyInvitations" location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -147,20 +136,9 @@
<widgets>
<decorator-screen name="CommonPartyInvitationDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <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>
+ <screenlet title="${uiLabelMap.PageTitlePartyInvitation}">
+ <include-form name="EditPartyInvitation" location="component://party/widget/partymgr/PartyInvitationForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Oct 17 09:07:19 2009
@@ -312,20 +312,9 @@
<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.PartyVendorInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditVendor" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyVendorInformation}">
+ <include-form name="EditVendor" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -349,14 +338,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <label style="h3" text="${uiLabelMap.PartyAttribute}"/>
- </container>
- <container style="screenlet-body">
- <include-form name="EditPartyAttribute" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyAttribute}">
+ <include-form name="EditPartyAttribute" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -475,20 +459,9 @@
<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.PageTitleEditPersonalInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditPersonalInformation}">
+ <include-form name="EditPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -509,20 +482,9 @@
<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.PageTitleEditGroupInformation}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditGroupInformation}">
+ <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -543,34 +505,12 @@
<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.PartyUserLoginChangePassword}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyUserLoginChangePassword}">
+ <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}">
+ <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -589,20 +529,9 @@
<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.PartyCreateUserLogin}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddUserLogin" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyCreateUserLogin}">
+ <include-form name="AddUserLogin" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -645,20 +574,9 @@
<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.PageTitleNewPartyNote}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddPartyNote" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleNewPartyNote}">
+ <include-form name="AddPartyNote" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -728,20 +646,9 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyCreateNewParty}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="create-new-party"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyCreateNewParty}">
+ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="create-new-party"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -771,20 +678,9 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyCreateNewCustomer}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyCreateNewCustomer}">
+ <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -814,20 +710,9 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyCreateNewProspect}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyCreateNewProspect}">
+ <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -857,20 +742,9 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartyCreateNewEmployee}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PartyCreateNewEmployee}">
+ <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -937,39 +811,17 @@
<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.PageTitleListContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditPartyContents" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
- <parameter param-name="partyId"/>
- </link>
- </container>
- <include-form name="ListPartyContents" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddPartyContent}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddPartyContent" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.PageTitleListContent}">
+ <container>
+ <link target="EditPartyContents" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit">
+ <parameter param-name="partyId"/>
+ </link>
</container>
- </container>
+ <include-form name="ListPartyContents" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleAddPartyContent}">
+ <include-form name="AddPartyContent" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Sat Oct 17 09:07:19 2009
@@ -136,20 +136,9 @@
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditAvsOverride}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditAvsOverride" location="component://party/widget/partymgr/PaymentMethodForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditAvsOverride}">
+ <include-form name="EditAvsOverride" location="component://party/widget/partymgr/PaymentMethodForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat Oct 17 09:07:19 2009
@@ -292,49 +292,44 @@
</and>
</condition>
<widgets>
- <container id="fin-account-summary" style="screenlet">
- <container style="screenlet-title-bar">
- <label style="h3" text="${uiLabelMap.PageTitleFinancialAccountSummary}"/>
+ <screenlet id="fin-account-summary" title="${uiLabelMap.PageTitleFinancialAccountSummary}">
+ <iterate-section entry="ownedFinAccount" paginate="true" paginate-target="viewprofile" view-size="3" list="ownedFinAccountList">
+ <section>
+ <actions>
+ <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
+ <order-by field-name="-transactionDate"/>
+ <limit-range start="0" size="5"/>
+ </entity-condition>
+ <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
+ <order-by field-name="-authorizationDate"/>
+ <limit-range start="0" size="5"/>
+ </entity-condition>
+ <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true">
+ <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/>
+ </entity-one>
+ <entity-one entity-name="StatusItem" value-field="finAccountStatusItem">
+ <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/>
+ </entity-one>
+ <entity-one entity-name="FinAccountType" value-field="ownedFinAccountType" auto-field-map="false" use-cache="true">
+ <field-map field-name="finAccountTypeId" from-field="ownedFinAccount.finAccountTypeId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template location="component://party/webapp/partymgr/party/profileblocks/FinAccounts.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </iterate-section>
+ <container id="apply-service-credit">
+ <label style="h2" text="${uiLabelMap.AccountingApplyServiceCredit}"/>
+ <include-form name="ApplyServiceCredit" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</container>
- <container style="screenlet-body">
- <iterate-section entry="ownedFinAccount" paginate="true" paginate-target="viewprofile" view-size="3" list="ownedFinAccountList">
- <section>
- <actions>
- <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList">
- <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
- <order-by field-name="-transactionDate"/>
- <limit-range start="0" size="5"/>
- </entity-condition>
- <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true">
- <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
- <order-by field-name="-authorizationDate"/>
- <limit-range start="0" size="5"/>
- </entity-condition>
- <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true">
- <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/>
- </entity-one>
- <entity-one entity-name="StatusItem" value-field="finAccountStatusItem">
- <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/>
- </entity-one>
- <entity-one entity-name="FinAccountType" value-field="ownedFinAccountType" auto-field-map="false" use-cache="true">
- <field-map field-name="finAccountTypeId" from-field="ownedFinAccount.finAccountTypeId"/>
- </entity-one>
- </actions>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/FinAccounts.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </iterate-section>
- <container id="apply-service-credit">
- <label style="h2" text="${uiLabelMap.AccountingApplyServiceCredit}"/>
- <include-form name="ApplyServiceCredit" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- </container>
- </container>
- </container>
+ </screenlet>
</widgets>
</section>
</widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml?rev=826204&r1=826203&r2=826204&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml Sat Oct 17 09:07:19 2009
@@ -39,24 +39,13 @@
<if-has-permission permission="SECURITY" action="_VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PartySecurityGroupsList}"/>
- </container>
+ <screenlet title="${uiLabelMap.PartySecurityGroupsList}">
+ <container style="button-bar">
+ <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
+ <link target="EditCertIssuerProvisions" style="smallSubmit" text="${uiLabelMap.PartyCertIssuers}"/>
</container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
- <link target="EditCertIssuerProvisions" style="smallSubmit" text="${uiLabelMap.PartyCertIssuers}"/>
- </container>
- <include-form name="ListSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="ListSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartySecurityViewPermissionError}</label>
@@ -80,20 +69,9 @@
<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.PageTitleEditSecurityGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditSecurityGroup}">
+ <include-form name="EditSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -112,48 +90,15 @@
<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.PageTitleEditSecurityGroupPermissions}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListSecurityGroupPermissions" 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.PartyAddPermissionToSecurityGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddSecurityGroupPermission" 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.PartyAddPermissionManuallyToSecurityGroup}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddSecurityGroupPermissionManual" location="component://party/widget/partymgr/SecurityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditSecurityGroupPermissions}">
+ <include-form name="ListSecurityGroupPermissions" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyAddPermissionToSecurityGroup}">
+ <include-form name="AddSecurityGroupPermission" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PartyAddPermissionManuallyToSecurityGroup}">
+ <include-form name="AddSecurityGroupPermissionManual" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -222,40 +167,18 @@
<if-has-permission permission="SECURITY" action="_VIEW"/>
</condition>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditIssuerProvisions}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
- <link target="EditCertIssuerProvisions" style="smallSubmit" text="${uiLabelMap.PartyCertIssuers}"/>
- </container>
- <container>
- <include-form name="CertIssuerList" location="component://party/widget/partymgr/SecurityForms.xml"/>
- </container>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddIssuerProvisions}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ViewCertificate" location="component://party/widget/partymgr/SecurityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditIssuerProvisions}">
+ <container style="button-bar">
+ <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
+ <link target="EditCertIssuerProvisions" style="smallSubmit" text="${uiLabelMap.PartyCertIssuers}"/>
+ </container>
+ <container>
+ <include-form name="CertIssuerList" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </container>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleAddIssuerProvisions}">
+ <include-form name="ViewCertificate" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.PartySecurityViewPermissionError}</label>