Author: adrianc
Date: Wed Sep 14 23:02:25 2011
New Revision: 1170888
URL: http://svn.apache.org/viewvc?rev=1170888&view=rev
Log:
Fixed Facility Group screen layout.
Modified:
ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
Modified:
ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml?rev=1170888&r1=1170887&r2=1170888&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupForms.xml Wed
Sep 14 23:02:25 2011
@@ -39,7 +39,7 @@ under the License.
<field name="facilityGroupId" use-when="facilityGroup!=null"
tooltip="&nbsp;${uiLabelMap.ProductNotModificationRecrationFacilityGroup}"><display/></field>
<field name="facilityGroupId"
use-when="facilityGroup==null"><hidden/></field>
<field name="facilityGroupTypeId">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="true">
<entity-options entity-name="FacilityGroupType"
key-field-name="facilityGroupTypeId" description="${description}">
</entity-options>
</drop-down>
@@ -139,7 +139,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink target="removeFacilityFromGroup"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink target="removeFacilityFromGroup"
description="${uiLabelMap.CommonRemove}" also-hidden="false">
<parameter param-name="facilityGroupId"/>
<parameter param-name="facilityId"/>
<parameter param-name="fromDate"/>
@@ -151,7 +151,7 @@ under the License.
<auto-fields-service service-name="addFacilityToGroup"/>
<field name="facilityGroupId"><hidden/></field>
<field name="facilityId">
- <drop-down>
+ <drop-down allow-empty="true">
<entity-options entity-name="Facility"
description="${facilityName} [${facilityId}]">
<entity-order-by field-name="facilityName"/>
</entity-options>
@@ -174,7 +174,7 @@ under the License.
<display-entity entity-name="RoleType" key-field-name="roleTypeId"
description="${description}"/>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink target="removePartyFromFacilityGroup"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink target="removePartyFromFacilityGroup"
description="${uiLabelMap.CommonRemove}" also-hidden="false">
<parameter param-name="facilityGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
Modified:
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=1170888&r1=1170887&r2=1170888&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
Wed Sep 14 23:02:25 2011
@@ -88,12 +88,11 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <screenlet
title="${uiLabelMap.PageTitleEditFacilityGroup}">
- <container style="button-bar">
- <link target="EditFacilityGroup"
text="${uiLabelMap.CommonNew}" style="buttontext create"/>
- </container>
- <include-form name="EditFacilityGroup"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
- </screenlet>
+ <container style="page-title"><label
text="${uiLabelMap.PageTitleEditFacilityGroup}"/></container>
+ <container style="button-bar">
+ <link target="EditFacilityGroup"
text="${uiLabelMap.CommonNew}" style="buttontext create"/>
+ </container>
+ <include-form name="EditFacilityGroup"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -112,13 +111,13 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <container>
- <label style="h1">${uiLabelMap.ProductFacilities}
${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName}
[${facilityGroup.facilityGroupId}]</label>
+ <container style="page-title">
+
<label>${uiLabelMap.PageTitleEditFacilityGroupMembers} ${uiLabelMap.CommonFor}
${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
+ </container>
+ <container style="button-bar">
+ <link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
</container>
<screenlet id="AddFacilityGroupMemberPanel"
title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
- <container style="button-bar">
- <link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
- </container>
<include-form name="AddFacilityGroupMember"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupMembers"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
@@ -139,11 +138,13 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <label style="h1">${uiLabelMap.PartyRoles}
${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName}
[${facilityGroup.facilityGroupId}]</label>
+ <container style="page-title">
+
<label>${uiLabelMap.PageTitleEditFacilityGroupRoles} ${uiLabelMap.CommonFor}
${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
+ </container>
+ <container style="button-bar">
+ <link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
+ </container>
<screenlet id="AddFacilityGroupRolePanel"
title="${uiLabelMap.ProductAddFacilityGroupPartyRole}" collapsible="true">
- <container style="button-bar">
- <link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
- </container>
<include-form name="AddFacilityGroupRole"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupRoles"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
@@ -158,7 +159,6 @@ under the License.
<set field="titleProperty"
value="PageTitleEditFacilityGroupRollup"/>
<set field="headerItem" value="facilityGroup"/>
<set field="tabButtonItem" value="EditFacilityGroupRollup"/>
-
<set field="parameters.facilityGroupId"
from-field="parameters.showFacilityGroupId"
default-value="${parameters.facilityGroupId}"/>
<entity-one entity-name="FacilityGroup"
value-field="facilityGroup"/>
<get-related relation-name="ParentFacilityGroupRollup"
value-field="facilityGroup" list="parentGroupRollups"/>
@@ -168,11 +168,11 @@ under the License.
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
- <container><label
style="h1">${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor}
${facilityGroup.facilityGroupName}
[${facilityGroup.facilityGroupId}]</label></container>
- <screenlet id="AddFacilityGroupRollupFromPanel"
title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true">
+ <container
style="page-title"><label>${uiLabelMap.PageTitleEditFacilityGroupRollup}
${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName}
[${facilityGroup.facilityGroupId}]</label></container>
<container style="button-bar">
<link target="EditFacilityGroup"
text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
</container>
+ <screenlet id="AddFacilityGroupRollupFromPanel"
title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true">
<include-form name="AddFacilityGroupRollupFrom"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupRollupTo"
location="component://product/widget/facility/FacilityGroupForms.xml"/>
