svn commit: r1293233 - in /ofbiz/trunk/applications/product: webapp/facility/facility/EditFacility.ftl webapp/facility/inventory/receiveInventory.ftl widget/facility/FacilityScreens.xml

[adrianc]

Author: adrianc
Date: Fri Feb 24 12:50:22 2012
New Revision: 1293233

URL: http://svn.apache.org/viewvc?rev=1293233&view=rev
Log:
Fixed UI layout in some facility screens.

Modified:
    ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
    ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=1293233&r1=1293232&r2=1293233&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Fri Feb 24 12:50:22 2012
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <#if facility?exists && facilityId?has_content>
-  <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFacilityForm" method="post">
+  <form action="<@ofbizUrl>UpdateFacility</@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
   <input type="hidden" name="facilityId" value="${facilityId?if_exists}" />
   <table class="basic-table" cellspacing='0'>
   <tr>
@@ -28,7 +28,7 @@ under the License.
     </td>
   </tr>
 <#else>
-  <form action="<@ofbizUrl>CreateFacility</@ofbizUrl>" name="EditFacilityForm" method="post" style='margin: 0;'>
+  <form action="<@ofbizUrl>CreateFacility</@ofbizUrl>" name="EditFacilityForm" method="post" class="basic-form">
   <#if facilityId?exists>
     <h3>${uiLabelMap.ProductCouldNotFindFacilityWithId} "${facilityId?if_exists}".</h3>
   </#if>

Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1293233&r1=1293232&r2=1293233&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Fri Feb 24 12:50:22 2012
@@ -19,12 +19,12 @@ under the License.
 <script language="JavaScript" type="text/javascript">
     function setNow(field) { eval('document.selectAllForm.' + field + '.value="${nowTimestamp}"'); }
 </script>
-<h1>${title}</h1>
+<div class="page-title">${title}</div>
         <#if invalidProductId?exists>
             <div class="errorMessage">${invalidProductId}</div>
         </#if>
-        <div class="button-bar">
-          <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacility}</a>
+        <div class="button-bar button-style-1">
+          <a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="create">${uiLabelMap.ProductNewFacility}</a>
         </div>
         <#-- Receiving Results -->
         <#if receivedItems?has_content>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1293233&r1=1293232&r2=1293233&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Feb 24 12:50:22 2012
@@ -176,14 +176,16 @@ under the License.
                                                 <not><if-empty field="facilityId"/></not>
                                             </condition>
                                             <widgets>
-                                                <container style="button-bar">
-                                                    <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
-                                                    <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app">
+                                                <container style="page-title">
+                                                    <label>${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facilityId}]</label>
+                                                </container>
+                                                <container style="button-bar button-style-1">
+                                                    <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
+                                                    <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" url-mode="inter-app">
                                                         <parameter param-name="facilityId"/>
                                                         <parameter param-name="externalLoginKey" from-field="parameters.externalLoginKey"/>
                                                     </link>
                                                 </container>
-                                                <label style="h1">${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facilityId}]</label>
                                                 <platform-specific><html><html-template location="component://product/webapp/facility/facility/EditFacility.ftl"/></html></platform-specific>
                                             </widgets>
                                         </section>
@@ -221,17 +223,19 @@ under the License.
     <screen name="FacilityChildren">
         <section>
             <actions>
-                <set field="titleProperty" value="ProductFacilityChildren"/>
-                <set field="headerItem" value="facility"/>
-                <set field="tabButtonItem" value="FacilityChildren"/>
-                <set field="facilityId" from-field="parameters.facilityId"/>
-                <set field="trail" from-field="parameters.trail" default-value="${facilityId}"/>
+                <set field="titleProperty" value="ProductFacilityChildren" />
+                <set field="headerItem" value="facility" />
+                <set field="tabButtonItem" value="FacilityChildren" />
+                <set field="facilityId" from-field="parameters.facilityId" />
+                <set field="trail" from-field="parameters.trail" default-value="${facilityId}" />
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="h1"><label text="${uiLabelMap.ProductFacilityChildren}"/></container>
-                        <include-tree location="component://product/widget/facility/FacilityTrees.xml" name="FacilityTree"/>
+                        <container style="page-title">
+                            <label text="${uiLabelMap.ProductFacilityChildren}" />
+                        </container>
+                        <include-tree location="component://product/widget/facility/FacilityTrees.xml" name="FacilityTree" />
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -562,11 +566,11 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <label style="h1">${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label>
+                        <container style="page-title">
+                            <label>${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label>
                         </container>
-                        <container style="button-bar">
-                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
+                        <container style="button-bar button-style-1">
+                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
                         </container>
                         <screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
                             <include-form name="SearchInventoryItemsDetailsParams" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -725,11 +729,11 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="h1">
+                        <container style="page-title">
                             <label>${title}</label>
                         </container>
-                        <container style="button-bar">
-                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
+                        <container style="button-bar button-style-1">
+                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
                         </container>
                         <screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
                             <include-form name="addGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -759,11 +763,11 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="h1">
+                        <container style="page-title">
                             <label>${title}</label>
                         </container>
-                        <container style="button-bar">
-                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
+                        <container style="button-bar button-style-1">
+                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
                         </container>
                         <screenlet id="add-facility-party-role" title="${uiLabelMap.ProductAddFacilityPartyRole}" collapsible="true">
                             <include-form name="AddPartyToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -788,15 +792,17 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <label style="h1">${title}</label>
-                        <container style="button-bar">
-                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
+                        <container style="page-title">
+                            <label>${title}</label>
+                        </container>
+                        <container style="button-bar button-style-1">
+                            <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="create"/>
                             <section>
                                 <condition>
                                     <not><if-empty field="facilityId"/></not>
                                 </condition>
                                 <widgets>
-                                    <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app">
+                                    <link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" url-mode="inter-app">
                                         <parameter param-name="period" value="month"/>
                                         <parameter param-name="facilityId"/>
                                         <parameter param-name="externalLoginKey"/>
@@ -806,7 +812,7 @@ under the License.
                                             <if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/>
                                         </condition>
                                         <widgets>
-                                            <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="buttontext create">
+                                            <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="create">
                                                 <parameter param-name="facilityId"/>
                                             </link>
                                         </widgets>
@@ -1529,7 +1535,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleFacilityGeoLocation} - ${facility.facilityName}"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFacilityDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <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">