You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/21 23:31:59 UTC
svn commit: r614033 [2/2] - in /ofbiz/trunk/applications/party: config/
webapp/partymgr/party/ webapp/partymgr/party/profileblocks/ widget/partymgr/
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Attributes.ftl Mon Jan 21 14:31:57 2008
@@ -25,23 +25,31 @@
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
</#if>
</ul>
- <br class="clear" />
+ <br class="clear"/>
</div>
<div class="screenlet-body">
<#if attributes?has_content>
- <table class="basic-table" cellspacing="0">
+ <table class="basic-table hover-bar" cellspacing="0">
+ <tr class="header-row">
+ <td>${uiLabelMap.CommonName}</td>
+ <td>${uiLabelMap.CommonValue}</td>
+ <td> </td>
+ </tr>
+ <#assign alt_row = false>
<#list attributes as attr>
- <tr>
- <td class="label">
- ${uiLabelMap.CommonName}: ${attr.attrName}
+ <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+ <td>
+ ${attr.attrName}
</td>
<td>
- ${uiLabelMap.CommonValue}: ${attr.attrValue}
+ ${attr.attrValue}
</td>
<td class="button-col">
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonEdit}</a>
</td>
</tr>
+ <#-- toggle the row color -->
+ <#assign alt_row = !alt_row>
</#list>
</table>
<#else>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl Mon Jan 21 14:31:57 2008
@@ -26,13 +26,18 @@
<div class="screenlet-body">
<table cellspacing="0" class="basic-table">
<#if partyRoles?has_content>
+ <tr class="header-row">
+ <td>${uiLabelMap.PartyRoleTypeId}</td>
+ <td>${uiLabelMap.PartyRole}</td>
+ <td> </td>
+ </tr>
<#list partyRoles as userRole>
<tr>
- <td class="label">${uiLabelMap.PartyRole}</td>
- <td>${userRole.get("description",locale)} [${userRole.roleTypeId}]</td>
+ <td align="left">${userRole.roleTypeId}</td>
+ <td align="left">${userRole.get("description",locale)}</td>
<#if hasDeletePermission>
<td class="button-col align-float">
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+ <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonRemove}</a>
</td>
<#else>
<td> </td>
@@ -40,14 +45,23 @@
</tr>
</#list>
<#else>
- ${uiLabelMap.PartyNoPartyRolesFound}
+ <tr>
+ <td colspan="3">
+ ${uiLabelMap.PartyNoPartyRolesFound}
+ </td>
+ </tr>
</#if>
+ </table>
+ </div>
+</div>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.PartyAddToRole}</h3>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
<#if hasUpdatePermission>
- <tr><td colspan="3"><hr></td></tr>
<tr>
- <td class="label">
- ${uiLabelMap.PartyAddToRole}
- </td>
<td>
<form name="addPartyRole" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="partyId" value="${partyId}"/>
@@ -59,7 +73,6 @@
<a href="javascript:document.addPartyRole.submit()" class="smallSubmit">${uiLabelMap.CommonAdd}</a>
</form>
</td>
- <td> </td>
</tr>
</#if>
</table>
@@ -68,7 +81,6 @@
<#-- Add role type -->
<#if hasCreatePermission>
-<br/>
<div id="newRoleType" class="screenlet">
<div class="screenlet-title-bar">
<h3>${uiLabelMap.PartyNewRoleType}</h3>
@@ -87,13 +99,11 @@
<td class="label">${uiLabelMap.CommonDescription}</td>
<td>
<input type="text" name="description" size="30" class="required"><span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ <a href="javascript:document.createroleform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a>
</td>
</tr>
- <tr>
- <td> </td>
- <td><a href="javascript:document.createroleform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a></td>
</table>
</form>
</div>
</div>
-</#if>
+</#if>
\ 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=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Mon Jan 21 14:31:57 2008
@@ -20,7 +20,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="FindPartyInvitations" type="single" default-map-name="partyInvitations" target="partyInvitation">
+ <form name="FindPartyInvitations" type="single" default-map-name="partyInvitations" target="partyInvitation"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="partyInvitationId"><text-find default-option="contains" ignore-case="true"/></field>
<field position="1" name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
<field position="2" name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
@@ -39,7 +40,8 @@
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation">
+ <form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
<field-map field-name="inputFields" env-name="parameters"/>
@@ -61,7 +63,8 @@
</field>
</form>
- <form name="EditPartyInvitation" type="single" target="updatePartyInvitation" default-map-name="partyInvitation">
+ <form name="EditPartyInvitation" type="single" target="updatePartyInvitation" default-map-name="partyInvitation"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="partyInvitation==null" target="createPartyInvitation"/>
<auto-fields-service service-name="updatePartyInvitation"/>
<field name="partyInvitationId"><hidden/></field>
@@ -83,7 +86,8 @@
<field name="submitButton" use-when="partyInvitation!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
- <form name="ListPartyInvitationGroupAssocs" type="list" list-name="partyInvitationGroupAssoc">
+ <form name="ListPartyInvitationGroupAssocs" type="list" list-name="partyInvitationGroupAssoc"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyInvitationGroupAssoc">
<condition-expr field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
@@ -103,7 +107,8 @@
</field>
</form>
- <form name="AddPartyInvitationGroupAssoc" type="single" target="createPartyInvitationGroupAssoc" default-map-name="partyInvitationGroupAssoc">
+ <form name="AddPartyInvitationGroupAssoc" type="single" target="createPartyInvitationGroupAssoc" default-map-name="partyInvitationGroupAssoc"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPartyInvitationGroupAssoc"/>
<field name="partyInvitationId"><hidden/> </field>
<field name="partyIdTo">
@@ -117,7 +122,8 @@
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
- <form name="ListPartyInvitationRoleAssocs" type="list" list-name="partyInvitationRoleAssoc">
+ <form name="ListPartyInvitationRoleAssocs" type="list" list-name="partyInvitationRoleAssoc"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="PartyInvitationRoleAssoc">
<condition-expr field-name="partyInvitationId" env-name="parameters.partyInvitationId"/>
@@ -133,7 +139,8 @@
</field>
</form>
- <form name="AddPartyInvitationRoleAssoc" type="single" target="createPartyInvitationRoleAssoc" title="" default-map-name="partyInvitationGroupAssoc">
+ <form name="AddPartyInvitationRoleAssoc" type="single" target="createPartyInvitationRoleAssoc" title="" default-map-name="partyInvitationGroupAssoc"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPartyInvitationRoleAssoc"/>
<field name="partyInvitationId"><hidden/> </field>
<field name="roleTypeId">
@@ -145,5 +152,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
-</forms>
-
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Mon Jan 21 14:31:57 2008
@@ -212,10 +212,16 @@
<widgets>
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3" text="${uiLabelMap.PartyNewRelationshipType}"/>
+ <container style="head4">
+ <label text="${uiLabelMap.PartyNewRelationshipType}"/>
+ </container>
</container>
<container style="screenlet-body">
- <include-form name="AddPartyRelationshipType" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <widgets>
+ <include-form name="AddPartyRelationshipType" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</container>
</container>
</widgets>
@@ -244,10 +250,16 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3" text="${uiLabelMap.PartyVendorInformation}"/>
+ <container style="head4">
+ <label text="${uiLabelMap.PartyVendorInformation}"/>
+ </container>
</container>
<container style="screenlet-body">
- <include-form name="EditVendor" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <widgets>
+ <include-form name="EditVendor" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</container>
</container>
</decorator-section>
@@ -307,8 +319,34 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="UpdatePartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- <include-form name="AddPartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditPartyTaxAuthInfos}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="UpdatePartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddPartyTaxAuthInfos}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddPartyTaxAuthInfo" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -396,7 +434,20 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -417,7 +468,20 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditPartyGroup" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -438,10 +502,34 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label text="${uiLabelMap.PartyUserLoginChangePassword}" style="head2"/></container>
- <include-form name="updatePassword" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- <container><label text="${uiLabelMap.PartyUserLoginUpdateSecuritySettings}" style="head2"/></container>
- <include-form name="updateUserLoginSecurity" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -460,8 +548,20 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label text="${uiLabelMap.PartyCreateUserLogin}" style="head2"/></container>
- <include-form name="AddUserLogin" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -481,10 +581,34 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head2" text="${uiLabelMap.PageTitleEditUserLoginSecurityGroups}"/></container>
- <include-form name="ListUserLoginSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
- <container><label style="head2" text="${uiLabelMap.PartyAddUserLoginToSecurityGroup}"/></container>
- <include-form name="AddUserLoginSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditUserLoginSecurityGroups}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListUserLoginSecurityGroups" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyAddUserLoginToSecurityGroup}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddUserLoginSecurityGroup" location="component://party/widget/partymgr/SecurityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -504,8 +628,20 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label text="${uiLabelMap.PageTitleNewPartyNote}" style="head2"/></container>
- <include-form name="AddPartyNote" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</decorator-section>
</decorator-screen>
</widgets>
@@ -525,9 +661,34 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1" text="${uiLabelMap.PageTitleEditPartyRates}"/></container>
- <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditPartyRates}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListPartyRates" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddPartyRates}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddPartyRate" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -551,11 +712,30 @@
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
- <label style="head3" text="${uiLabelMap.PartySegmentRoles}"/>
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleViewPartySegmentRoles}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListSegmentRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddPartySegmentRoles}"/>
+ </container>
</container>
<container style="screenlet-body">
- <include-form name="ListSegmentRoles" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- <include-form name="AddSegmentRole" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <section>
+ <widgets>
+ <include-form name="AddSegmentRole" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</container>
</container>
</decorator-section>
@@ -579,9 +759,19 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <label style="head1" text="${uiLabelMap.PartyCreateNewParty}"/>
- <container style="screenlet-body">
- <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="create-new-party"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</widgets>
<fail-widgets>
@@ -612,8 +802,20 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container><label text="${uiLabelMap.PartyCreateNewCustomer}" style="head2"/></container>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -643,8 +845,20 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container><label text="${uiLabelMap.PartyCreateNewProspect}" style="head2"/></container>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -674,8 +888,20 @@
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
</condition>
<widgets>
- <container><label text="${uiLabelMap.PartyCreateNewEmployee}" style="head2"/></container>
- <include-form name="NewUser" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrCreatePermissionError}</label>
@@ -691,7 +917,7 @@
<screen name="AddressMatchMap">
<section>
<actions>
- <set field="title" value="Address Match Map Entry"/>
+ <set field="titleProperty" value="PageTitleAddressMatchMap"/>
<set field="headerItem" value="addrmap"/>
<entity-condition entity-name="AddressMatchMap" list-name="addressMatchMaps">
<order-by field-name="sequenceNum"/>
@@ -712,7 +938,7 @@
<screen name="FindAddressMatch">
<section>
<actions>
- <set field="title" value="Address Matches"/>
+ <set field="titleProperty" value="PageTitleAddressMatches"/>
<set field="headerItem" value="addrmap"/>
<script location="component://party/webapp/partymgr/WEB-INF/actions/party/findMatches.bsh"/>
</actions>
@@ -742,11 +968,35 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link target="EditPartyContents?partyId=${partyId}" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"/></container>
- <container><label style="head1" text="${uiLabelMap.PageTitleListContent}"/></container>
- <include-form name="ListPartyContents" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
- <label style="head1">${uiLabelMap.PageTitleAddPartyContent}</label>
- <include-form name="AddPartyContent" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListContent}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="EditPartyContents?partyId=${partyId}" text="${uiLabelMap.CommonCreateNew}" style="smallSubmit"/></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="head4">
+ <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>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -756,23 +1006,28 @@
<screen name="editCarrierAccount">
<section>
<actions>
- <set field="titleProperty" value="PageTitlePartyCarrierAccount"/>
+ <set field="titleProperty" value="PageTitlePartyCarrierAccount"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
- <container style="screenlet-title-bar">
- <label style="head3">${uiLabelMap.PartyShipperAccount}</label>
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PartyShipperAccount}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditCarrierAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </widgets>
+ </section>
</container>
- <include-form name="EditCarrierAccount" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-
-</screens>
-
-
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml Mon Jan 21 14:31:57 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
@@ -21,11 +21,12 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="EditAvsOverride" type="single" target="updateAvsOverride" default-map-name="avsOverride">
+ <form name="EditAvsOverride" type="single" target="updateAvsOverride" default-map-name="avsOverride"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="partyId"><hidden/></field>
<field name="avsDeclineString" title="${uiLabelMap.PartyAvsString}"><text size="60" maxlength="250"/></field>
<field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?partyId=${partyId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=614033&r1=614032&r2=614033&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Mon Jan 21 14:31:57 2008
@@ -45,7 +45,7 @@
<label style="head3">${uiLabelMap.AccountingCardInfoNotBelongToYou}</label>
</container>
<container>
- <link target="authview/${donePage}" text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/>
+ <link target="authview/${donePage}" text="${uiLabelMap.CommonBack}" style="smallSubmit"/>
</container>
</fail-widgets>
</section>
@@ -136,7 +136,20 @@
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
- <include-form name="EditAvsOverride" location="component://party/widget/partymgr/PaymentMethodForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <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>
</widgets>
<fail-widgets>
<label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -147,4 +160,4 @@
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file