svn commit: r996678 - in /ofbiz/branches/jquery/framework: common/webcommon/WEB-INF/common-controller.xml webtools/widget/GeoManagementForms.xml webtools/widget/GeoManagementScreens.xml

Author: jleroux
Date: Mon Sep 13 20:24:50 2010
New Revision: 996678

URL: http://svn.apache.org/viewvc?rev=996678&view=rev
Log:
Geo Management: contribution done to OFBiz Webtools. I will see tomorrow if it's worth to update Zone Management in function of these changes

Modified:
    ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml
    ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml

Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml?rev=996678&r1=996677&r2=996678&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml Mon Sep 13 20:24:50 2010
@@ -214,12 +214,12 @@ under the License.
         <response name="success" type="request" value="json"/>
         <response name="error" type="request" value="json"/>
     </request-map>
-
+    
+    <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
 
     <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
     <!--========================== AJAX events =====================-->
 
-
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
     <view-map name="main" type="none"/>

Modified: ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml?rev=996678&r1=996677&r2=996678&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/GeoManagementForms.xml Mon Sep 13 20:24:50 2010
@@ -69,21 +69,22 @@
                 </entity-options>
             </drop-down>
         </field>        
-        <field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}">
+        <field name="dummy" title="${uiLabelMap.CommonEmptyHeader}" position="2"><display/></field>
+        <field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}" position="3">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="geoAssocTypeId" entity-name="GeoAssocType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="geoId" title="${uiLabelMap.CommonGeo}">
+        <field name="geoId" title="${uiLabelMap.CommonGeo}" position="3">
             <drop-down>
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}">
                     <entity-order-by field-name="geoName"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" ><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field>
     </form>
         
 </forms>

Modified: ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml?rev=996678&r1=996677&r2=996678&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/GeoManagementScreens.xml Mon Sep 13 20:24:50 2010
@@ -87,6 +87,7 @@
             <widgets>
                 <decorator-screen name="CommonGeoManagementDecorator" location="component://webtools/widget/CommonScreens.xml">
                     <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://common/webcommon/includes/setMutipleSelectJs.ftl"/></html></platform-specific>                            
                         <screenlet title="${uiLabelMap.WebtoolsGeosLinkExplained}">
                             <include-form name="LinkGeos" location="component://webtools/widget/GeoManagementForms.xml"/>
                         </screenlet>