svn commit: r1170780 - in /ofbiz/trunk/applications/product/widget/facility: FacilityForms.xml FacilityScreens.xml

[adrianc]

Author: adrianc
Date: Wed Sep 14 19:17:15 2011
New Revision: 1170780

URL: http://svn.apache.org/viewvc?rev=1170780&view=rev
Log:
Fixed Facility Geo Location screen layout.

Modified:
    ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1170780&r1=1170779&r2=1170780&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Wed Sep 14 19:17:15 2011
@@ -934,7 +934,7 @@ under the License.
     </form>
 
     <form name="EditFacilityGeoPoint" type="single" target="createUpdateFacilityGeoPoint" default-map-name="geoPoint"
-        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+        default-table-style="basic-table">
         <field name="facilityId"><hidden value="${facilityId}"/></field>
         <field name="geoPointId"><hidden/></field>
         <field name="dataSourceId">

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1170780&r1=1170779&r2=1170780&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Sep 14 19:17:15 2011
@@ -1514,7 +1514,6 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="EditFacilityGeoPoint"/>
-                <set field="titleProperty" value="PageTitleFacilityGeoLocation"/>
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <entity-one entity-name="Facility" value-field="facility"/>
                 <get-related-one relation-name="GeoPoint" to-value-field="geoPoint" value-field="facility"/>
@@ -1525,10 +1524,13 @@ under the License.
                 <set field="geoChart.width" value="600px"/>
                 <set field="geoChart.height" value="500px"/>
                 <set field="geoChart.points" from-field="geoPoints"/>          
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap"/>
+                <set field="title" value="${uiLabelMap.PageTitleFacilityGeoLocation} - ${facility.facilityName}"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
+                        <container style="page-title"><label text="${title}"/></container>
                         <screenlet id="edit-facility-geopoint" title="${uiLabelMap.ProductEditFacilityGeoLocation}" collapsible="true" initially-collapsed="true">
                             <include-form name="EditFacilityGeoPoint" location="component://product/widget/facility/FacilityForms.xml"/>
                         </screenlet>