Author: deepak
Date: Sun Jul 15 09:10:49 2018
New Revision: 1835957
URL: http://svn.apache.org/viewvc?rev=1835957&view=rev
Log:
Improved: Standardise layout for Party
(OFBIZ-10334)
Thanks Dennis Balkir for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/humanres/widget/EmploymentAppScreens.xml
Sun Jul 15 09:10:49 2018
@@ -65,7 +65,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListEmploymentApps"
location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
+ <screenlet>
+ <include-form name="ListEmploymentApps"
location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
+ </screenlet>
<screenlet id="AddEmploymentAppPanel"
title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmploymentApp}"
collapsible="true">
<include-form name="AddEmploymentApp"
location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</screenlet>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
Sun Jul 15 09:10:49 2018
@@ -41,7 +41,9 @@ under the License.
<screenlet id="AddPartyContactListPanel"
title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true">
<include-form name="AddPartyContactList"
location="component://party/widget/partymgr/PartyContactListForms.xml"/>
</screenlet>
- <include-grid name="ListPartyContactLists"
location="component://party/widget/partymgr/PartyContactListForms.xml"/>
+ <screenlet>
+ <include-grid name="ListPartyContactLists"
location="component://party/widget/partymgr/PartyContactListForms.xml"/>
+ </screenlet>
</widgets>
<fail-widgets>
<label
style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyForms.xml
Sun Jul 15 09:10:49 2018
@@ -1295,7 +1295,7 @@ under the License.
<!-- For an unknown reason yet grid can't be used here see OFBIZ-9405 -->
<form name="ListPartyIdentification" list-name="listIt" type="list"
- default-table-style="basic-table hover-bar"
target="EditPartyIdentification">
+ default-table-style="basic-table"
target="EditPartyIdentification">
<actions>
<entity-and entity-name="PartyIdentificationAndParty" >
<field-map field-name="partyId" from-field="partyId"/>
@@ -1315,7 +1315,7 @@ under the License.
</form>
<form name="EditPartyIdentification" type="single" list-name="partyIdents"
- default-table-style="basic-table hover-bar"
target="createPartyIdentification" focus-field-name="idValue">
+ default-table-style="basic-table"
target="createPartyIdentification" focus-field-name="idValue">
<alt-target use-when="partyIdentification !=null"
target="updatePartyIdentification"/>
<field name="partyIdentificationTypeId" use-when="partyIdentification
== null">
<drop-down>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyMenus.xml
Sun Jul 15 09:10:49 2018
@@ -272,7 +272,7 @@
</menu-item>
</menu>
- <menu name="PersonUpdate">
+ <menu name="PersonUpdate" menu-container-style="basic-nav">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editperson">
<parameter param-name="partyId"
from-field="parameters.partyId"/>
@@ -317,7 +317,7 @@
</menu-item>
</menu>
- <menu name="GroupUpdate">
+ <menu name="GroupUpdate" menu-container-style="basic-nav">
<menu-item name="update" title="${uiLabelMap.CommonUpdate}">
<link target="editpartygroup">
<parameter param-name="partyId" from-field="party.partyId"/>
@@ -326,7 +326,7 @@
</menu-item>
</menu>
- <menu name="AddShipper">
+ <menu name="AddShipper" menu-container-style="basic-nav">
<menu-item name="new" title="${uiLabelMap.CommonCreateNew}">
<condition>
<if-has-permission permission="PARTYMGR" action="_CREATE"/>
@@ -732,7 +732,7 @@
</menu-item>
</menu>
- <menu name="AddRelContactAccounts">
+ <menu name="AddRelContactAccounts" menu-container-style="basic-nav">
<menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
<link target="AddPartyRelatedAccount">
<parameter param-name="partyId"/>
@@ -742,7 +742,7 @@
</menu-item>
</menu>
- <menu name="AddRelAccountContacts">
+ <menu name="AddRelAccountContacts" menu-container-style="basic-nav">
<menu-item name="add" title="${uiLabelMap.CommonCreateNew}">
<link target="AddAccountRelatedContact">
<parameter param-name="partyId"/>
@@ -752,7 +752,7 @@
</menu-item>
</menu>
- <menu name="NewPartyIdentification">
+ <menu name="NewPartyIdentification" menu-container-style="basic-nav">
<menu-item name="new" title="${uiLabelMap.CommonNew}">
<link target="viewidentifications">
<parameter param-name="partyId"
from-field="parameters.partyId"/>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
Sun Jul 15 09:10:49 2018
@@ -680,7 +680,9 @@ under the License.
<screenlet id="AddPartyRatesPanel"
title="${uiLabelMap.PageTitleEditPartyRates}" collapsible="true">
<include-form name="AddPartyRate"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
- <include-grid name="ListPartyRates"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ <screenlet>
+ <include-grid name="ListPartyRates"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -705,7 +707,9 @@ under the License.
<screenlet id="AddSegmentRolePanel"
title="${uiLabelMap.PageTitleAddPartySegmentRoles}" collapsible="true">
<include-form name="AddSegmentRole"
location="component://party/widget/partymgr/PartyForms.xml"/>
</screenlet>
- <include-grid name="ListSegmentRoles"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ <screenlet>
+ <include-grid name="ListSegmentRoles"
location="component://party/widget/partymgr/PartyForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -982,7 +986,9 @@ under the License.
<screenlet id="EditPartyResumePanel"
title="${uiLabelMap.CommonAdd} ${uiLabelMap.PartyParty}
${uiLabelMap.HumanResPartyResume}" collapsible="true">
<include-form name="EditPartyResume"
location="component://humanres/widget/forms/PartyResumeForms.xml"/>
</screenlet>
- <include-form name="ListPartyResumes"
location="component://humanres/widget/forms/PartyResumeForms.xml"/>
+ <screenlet>
+ <include-form name="ListPartyResumes"
location="component://humanres/widget/forms/PartyResumeForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml?rev=1835957&r1=1835956&r2=1835957&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml Sun
Jul 15 09:10:49 2018
@@ -79,7 +79,9 @@ under the License.
<container style="page-title">
<label
text="${uiLabelMap.PageTitleEditSecurityGroup} - ${groupId}"/>
</container>
- <include-form name="EditSecurityGroup"
location="component://common/widget/SecurityForms.xml"/>
+ <screenlet>
+ <include-form name="EditSecurityGroup"
location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -135,7 +137,9 @@ under the License.
<screenlet id="AddSecurityGroupProtectedViewsPanel"
title="${uiLabelMap.AddProtectedViewToSecurityGroup}" collapsible="true">
<include-form name="AddSecurityGroupProtectedView"
location="component://common/widget/SecurityForms.xml"/>
</screenlet>
- <include-form name="ListSecurityGroupProtectedViews"
location="component://common/widget/SecurityForms.xml"/>
+ <screenlet>
+ <include-form name="ListSecurityGroupProtectedViews"
location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -159,7 +163,9 @@ under the License.
<screenlet id="AddSecurityGroupUserLoginsPanel"
title="${uiLabelMap.AddUserLoginToSecurityGroup}" collapsible="true">
<include-form name="AddSecurityGroupUserLogin"
location="component://common/widget/SecurityForms.xml"/>
</screenlet>
- <include-form name="ListSecurityGroupUserLogins"
location="component://common/widget/SecurityForms.xml"/>
+ <screenlet>
+ <include-form name="ListSecurityGroupUserLogins"
location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -213,7 +219,9 @@ under the License.
<screenlet id="AddUserLoginSecurityGroupsPanel"
title="${uiLabelMap.AddUserLoginToSecurityGroup}" collapsible="true">
<include-form name="AddUserLoginSecurityGroup"
location="component://common/widget/SecurityForms.xml"/>
</screenlet>
- <include-form name="ListUserLoginSecurityGroups"
location="component://common/widget/SecurityForms.xml"/>
+ <screenlet>
+ <include-form name="ListUserLoginSecurityGroups"
location="component://common/widget/SecurityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
