svn commit: r988875 - in /ofbiz/branches/jquery: ./ applications/manufacturing/servicedef/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/order/webapp/ordermgr/WEB-INF/actions/entry/ applications/party/webapp/partymgr/party/ applicat...

Author: jleroux
Date: Wed Aug 25 08:28:22 2010
New Revision: 988875

URL: http://svn.apache.org/viewvc?rev=988875&view=rev
Log:
Merge the trunk at r988846

Added:
    ofbiz/branches/jquery/framework/base/lib/scripting/groovy-all-1.7.4.jar
      - copied unchanged from r988870, ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.4.jar
    ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.reportitem_2.6.0.v20100604.jar
      - copied unchanged from r988870, ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.reportitem_2.6.0.v20100604.jar
    ofbiz/branches/jquery/framework/example/webapp/birt/birt/chartReport.ftl
      - copied unchanged from r988870, ofbiz/trunk/framework/example/webapp/birt/birt/chartReport.ftl
    ofbiz/branches/jquery/framework/example/webapp/birt/report/chart.rptdesign
      - copied unchanged from r988870, ofbiz/trunk/framework/example/webapp/birt/report/chart.rptdesign
Removed:
    ofbiz/branches/jquery/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
    ofbiz/branches/jquery/framework/base/lib/scripting/groovy-all-1.7.3.jar
    ofbiz/branches/jquery/framework/birt/lib/platform/plugins/org.eclipse.birt.chart.reportitem_2.5.1.v20090902a.jar
Modified:
    ofbiz/branches/jquery/   (props changed)
    ofbiz/branches/jquery/.classpath
    ofbiz/branches/jquery/LICENSE
    ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml
    ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
    ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
    ofbiz/branches/jquery/applications/product/servicedef/services_view.xml
    ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacility.ftl
    ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl
    ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
    ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml
    ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml
    ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml
    ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml
    ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml
    ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml
    ofbiz/branches/jquery/framework/webtools/widget/TempExprScreens.xml
    ofbiz/branches/jquery/framework/webtools/widget/tempExprForms.xml
    ofbiz/branches/jquery/macros.xml
    ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml
    ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl

Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 25 08:28:22 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-987448
+/ofbiz/trunk:951708-988870

Modified: ofbiz/branches/jquery/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/.classpath (original)
+++ ofbiz/branches/jquery/.classpath Wed Aug 25 08:28:22 2010
@@ -90,7 +90,7 @@
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-util-3.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.7.3.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-1.7.4.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/chartengineapi.jar"/>

Modified: ofbiz/branches/jquery/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/LICENSE (original)
+++ ofbiz/branches/jquery/LICENSE Wed Aug 25 08:28:22 2010
@@ -66,7 +66,7 @@ ofbiz/trunk/framework/base/lib/j2eespecs
 ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-servlet-api.jar
 ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
 ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
-ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.3.jar
+ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.4.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
 ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar

Modified: ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml (original)
+++ ofbiz/branches/jquery/applications/manufacturing/servicedef/services_calendar.xml Wed Aug 25 08:28:22 2010
@@ -24,24 +24,22 @@ under the License.
     <version>1.0</version>
 
     <!-- Routing services -->
-    <service name="createCalendar" engine="simple"
+    <service name="createCalendar" engine="simple" default-entity-name="TechDataCalendar"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendar">
         <description>Create a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendar" engine="simple"
+    <service name="updateCalendar" engine="simple" default-entity-name="TechDataCalendar"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendar">
         <description>Update a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendar" engine="simple"
+    <service name="removeCalendar" engine="simple" default-entity-name="TechDataCalendar"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendar">
         <description>Remove a calendar</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
     <service name="createCalendarWeek" engine="simple" default-entity-name="TechDataCalendarWeek"
@@ -62,48 +60,38 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
-    <service name="createCalendarExceptionDay" engine="simple"
+    <service name="createCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionDay">
         <description>Create a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" mode="IN" optional="false"/>
-        <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendarExceptionDay" engine="simple"
+    <service name="updateCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" mode="IN" optional="false"/>
-        <attribute name="exceptionCapacity" type="BigDecimal" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendarExceptionDay" engine="simple"
+    <service name="removeCalendarExceptionDay" engine="simple" default-entity-name="TechDataCalendarExcDay"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionDay">
         <description>Update a calendar ExceptionDay</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="exceptionDateStartTime" type="java.sql.Timestamp" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-    <service name="createCalendarExceptionWeek" engine="simple"
+    <service name="createCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="createCalendarExceptionWeek">
         <description>Create a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" optional="false"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateCalendarExceptionWeek" engine="simple"
+    <service name="updateCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="updateCalendarExceptionWeek">
         <description>Update a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="description" type="String" mode="IN" optional="true"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" optional="false"/>
-        <attribute name="calendarWeekId" type="String" mode="IN" optional="true"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="removeCalendarExceptionWeek" engine="simple"
+    <service name="removeCalendarExceptionWeek" engine="simple" default-entity-name="TechDataCalendarExcWeek"
             location="component://manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml" invoke="removeCalendarExceptionWeek">
         <description>Remove a Calendar Exception Week</description>
-        <attribute name="calendarId" type="String" mode="IN" optional="false"/>
-        <attribute name="exceptionDateStart" type="java.sql.Date" mode="IN" optional="false"/>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 </services>

Modified: ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Wed Aug 25 08:28:22 2010
@@ -1519,6 +1519,22 @@ public class ShoppingCart implements Ite
         return inf;
     }
 
+    /** Creates a CartPaymentInfo object with a possible authCode (may be null) */
+    public CartPaymentInfo makePaymentInfo(String id, String refNum, String authCode, BigDecimal amount) {
+        CartPaymentInfo inf = new CartPaymentInfo();
+        inf.refNum[0] = refNum;
+        inf.refNum[1] = authCode;
+        inf.amount = amount;
+
+        if (!isPaymentMethodType(id)) {
+            inf.paymentMethodTypeId = this.getPaymentMethodTypeId(id);
+            inf.paymentMethodId = id;
+        } else {
+            inf.paymentMethodTypeId = id;
+        }
+        return inf;
+    }
+
     /** Locates the index of an existing CartPaymentInfo object or -1 if none found */
     public int getPaymentInfoIndex(String id, String refNum) {
         CartPaymentInfo thisInf = this.makePaymentInfo(id, refNum, null);
@@ -1561,7 +1577,7 @@ public class ShoppingCart implements Ite
 
     /** Locates an existing (or creates a new) CartPaymentInfo object */
     public CartPaymentInfo getPaymentInfo(String id, String refNum, String authCode, BigDecimal amount, boolean update) {
-        CartPaymentInfo thisInf = this.makePaymentInfo(id, refNum, amount);
+        CartPaymentInfo thisInf = this.makePaymentInfo(id, refNum, authCode, amount);
         Iterator i = paymentInfo.iterator();
         while (i.hasNext()) {
             CartPaymentInfo inf = (CartPaymentInfo) i.next();

Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Wed Aug 25 08:28:22 2010
@@ -42,7 +42,7 @@ context.shoppingCart = shoppingCart;
 salesChannels = delegator.findByAndCache("Enumeration", [enumTypeId : "ORDER_SALES_CHANNEL"], ["sequenceId"]);
 context.salesChannels = salesChannels;
 
-productStores = delegator.findList("ProductStore", null, null, ["storeName"], null, true);
+productStores = delegator.findList("ProductStore", null, null, ["productStoreId", "storeName"], null, true);
 context.productStores = productStores;
 
 suppliers = delegator.findByAnd("PartyRoleAndPartyDetail", [roleTypeId : "SUPPLIER"], ["groupName", "partyId"]);

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml Wed Aug 25 08:28:22 2010
@@ -61,21 +61,28 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
                         <section>
+                            <condition>
+                                <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
+                            </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
-                                </platform-specific>
+                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
                             </widgets>
                         </section>
                     </decorator-section>
                     <decorator-section name="body">
                         <section>
+                            <condition>
+                                <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
+                            </condition>
                             <widgets>
                                 <screenlet id="AddPartyClassificationGroupPartiesPanel" title="${uiLabelMap.PartyClassificationGroups}" collapsible="true">
                                     <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
                                 </screenlet>
                                 <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
                             </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+                            </fail-widgets>
                         </section>
                     </decorator-section>
                 </decorator-screen>
@@ -125,20 +132,27 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
                         <section>
+                            <condition>
+                                <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
+                            </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
-                                </platform-specific>
+                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="PartyClassificationTabBar"/>
                             </widgets>
                         </section>
                     </decorator-section>
                     <decorator-section name="body">
                         <section>
+                            <condition>
+                                <if-service-permission service-name="partyBasePermissionCheck" main-action="VIEW"/>
+                            </condition>
                             <widgets>
                                 <screenlet title="${uiLabelMap.PartyClassificationGroup}">
                                     <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
                                 </screenlet>
                             </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
+                            </fail-widgets>
                         </section>
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml Wed Aug 25 08:28:22 2010
@@ -419,17 +419,10 @@ under the License.
         <field name="USER_ADDRESS1" title="${uiLabelMap.CommonAddress1}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
         <field name="USER_ADDRESS2" title="${uiLabelMap.CommonAddress2}"><text size="30" maxlength="60"/></field>
         <field name="USER_CITY" title="${uiLabelMap.CommonCity}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="60"/></field>
-        <field name="USER_STATE" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
-            <drop-down allow-empty="true">
-                <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId} - ${geoName}">
-                    <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/>
-                    <entity-order-by field-name="geoId"/>
-                </entity-options>
-            </drop-down>
-        </field>
+        <field name="USER_STATE" title="${uiLabelMap.CommonState}" widget-style="required"><drop-down allow-empty="false"/></field>                      
         <field name="USER_POSTAL_CODE" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="10" maxlength="30"/></field>
         <field name="USER_COUNTRY" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
-            <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}">
+            <drop-down no-current-selected-key="${defaultCountryGeoId}">
                 <entity-options entity-name="Geo" key-field-name="geoId" description="${geoId}: ${geoName}">
                     <entity-constraint name="geoTypeId" value="COUNTRY"/>
                     <entity-order-by field-name="geoId"/>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyMenus.xml Wed Aug 25 08:28:22 2010
@@ -712,5 +712,18 @@
             </link>
         </menu-item>
     </menu>
+
+    <menu name="PartyClassificationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="EditPartyClassificationGroup" title="${uiLabelMap.PartyClassificationGroups}">
+            <link target="EditPartyClassificationGroup">
+                <parameter param-name="partyClassificationGroupId"/>
+            </link>
+        </menu-item>
+        <menu-item name="EditPartyClassificationGroupParties" title="${uiLabelMap.PartyParties}">
+            <link target="EditPartyClassificationGroupParties">
+                <parameter param-name="partyClassificationGroupId"/>
+            </link>
+        </menu-item>
+    </menu>
     
 </menus>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml Wed Aug 25 08:28:22 2010
@@ -671,7 +671,20 @@ under the License.
                             <condition>
                                 <if-has-permission permission="PARTYMGR" action="_CREATE"/>
                             </condition>
+                            <actions>
+                                <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? -->
+                                <set field="dependentForm" value="NewUser"/>
+                                <set field="paramKey" value="countryGeoId"/>                                        
+                                <set field="mainId" value="USER_COUNTRY"/>
+                                <set field="dependentId" value="USER_STATE"/>
+                                <set field="requestName" value="getAssociatedStateList"/>
+                                <set field="responseName" value="stateList"/>
+                                <set field="dependentKeyName" value="geoId"/>
+                                <set field="descName" value="geoName"/>
+                                <set field="selectedDependentOption" value="_none_"/>
+                            </actions>
                             <widgets>
+                                <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific>
                                 <screenlet title="${uiLabelMap.PartyCreateNewCustomer}">
                                     <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/>
                                 </screenlet>
@@ -703,7 +716,20 @@ under the License.
                             <condition>
                                 <if-has-permission permission="PARTYMGR" action="_CREATE"/>
                             </condition>
+                            <actions>
+                                <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? -->
+                                <set field="dependentForm" value="NewUser"/>
+                                <set field="paramKey" value="countryGeoId"/>                                        
+                                <set field="mainId" value="USER_COUNTRY"/>
+                                <set field="dependentId" value="USER_STATE"/>
+                                <set field="requestName" value="getAssociatedStateList"/>
+                                <set field="responseName" value="stateList"/>
+                                <set field="dependentKeyName" value="geoId"/>
+                                <set field="descName" value="geoName"/>
+                                <set field="selectedDependentOption" value="_none_"/>
+                            </actions>
                             <widgets>
+                                <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific>
                                 <screenlet title="${uiLabelMap.PartyCreateNewProspect}">
                                     <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/>
                                 </screenlet>
@@ -735,7 +761,20 @@ under the License.
                             <condition>
                                 <if-has-permission permission="PARTYMGR" action="_CREATE"/>
                             </condition>
+                            <actions>
+                                <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? -->
+                                <set field="dependentForm" value="NewUser"/>
+                                <set field="paramKey" value="countryGeoId"/>                                        
+                                <set field="mainId" value="USER_COUNTRY"/>
+                                <set field="dependentId" value="USER_STATE"/>
+                                <set field="requestName" value="getAssociatedStateList"/>
+                                <set field="responseName" value="stateList"/>
+                                <set field="dependentKeyName" value="geoId"/>
+                                <set field="descName" value="geoName"/>
+                                <set field="selectedDependentOption" value="_none_"/>
+                            </actions>
                             <widgets>
+                                <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific>
                                 <screenlet title="${uiLabelMap.PartyCreateNewEmployee}">
                                     <include-form name="NewUser" location="component://party/widget/partymgr/PartyForms.xml"/>
                                 </screenlet>

Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Wed Aug 25 08:28:22 2010
@@ -20267,7 +20267,7 @@
         <value xml:lang="de">Bis Datum/Zeit, Sequenz Menge</value>
         <value xml:lang="en">Thru Date/Time, Sequence Quantity</value>
         <value xml:lang="es">Fecha fin/Hora, Secuencia y cantidad</value>
-        <value xml:lang="fr">Jusqu'à la date et l'heure, la séquence et la quantité</value>
+        <value xml:lang="fr">Jusqu'à la date et heure, séquence et quantité</value>
         <value xml:lang="it">Alla Data/Ora,Sequenza e Quantità</value>
         <value xml:lang="ro">La Data/Ora,Secventa si Cantitatea ProductThruDateTimeSequenceType=La Data/Ora,Secventa si Tipul</value>
         <value xml:lang="ru">До даты/времени, последовательность и кол-во</value>

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Wed Aug 25 08:28:22 2010
@@ -842,7 +842,7 @@ under the License.
     </simple-method>
 
     <!-- To help dynamically populate a products dropdown given a product category id from a change in another dropdown, possibly sorted on sequenceNum -->    
-    <simple-method method-name="getAssociatedProductsList" short-description="Set the product options for selected product category" login-required="false">
+    <simple-method method-name="getAssociatedProductsList" short-description="Set the product options for selected product category, mostly used by getDependentDropdownValues.js" login-required="false">
         <set field="parameters.categoryId" from-field="parameters.productCategoryId"/>
         <set-service-fields service-name="getProductCategoryMembers" map="parameters" to-map="getProductCategoryMembersMap"/>        
         <call-service service-name="getProductCategoryMembers" in-map-name="getProductCategoryMembersMap">

Modified: ofbiz/branches/jquery/applications/product/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_view.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/services_view.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/services_view.xml Wed Aug 25 08:28:22 2010
@@ -119,6 +119,7 @@ under the License.
     
     <service name="getAssociatedProductsList" engine="simple" auth="false"
         location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="getAssociatedProductsList">
+        <description>Set the product options for selected product category, mostly used by getDependentDropdownValues.js</description>
         <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
         <attribute name="products" mode="OUT" type="java.util.List"/>
     </service>

Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacility.ftl?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/EditFacility.ftl Wed Aug 25 08:28:22 2010
@@ -67,8 +67,7 @@ under the License.
           <#list weightUomList as uom>
             <option value='${uom.uomId}'
                <#if (facility.defaultWeightUomId?has_content) && (uom.uomId == facility.defaultWeightUomId)>
-              
-              
+               selected="selected"
                </#if>
              >${uom.get("description",locale)?default(uom.uomId)}</option>
           </#list>
@@ -89,7 +88,6 @@ under the License.
       </select>
     </td>
   </tr>
-
   <tr>
     <td class="label">${uiLabelMap.ProductName}</td>
     <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60" /></td>
@@ -121,7 +119,6 @@ under the License.
     <td class="label">${uiLabelMap.ProductDefaultDaysToShip}</td>
     <td><input type="text" name="defaultDaysToShip" value="${facility.defaultDaysToShip?if_exists}" size="10" maxlength="20" /></td>
   </tr>
-
   <tr>
     <td>&nbsp;</td>
     <#if facilityId?has_content>

Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/includes/setDependentDropdownValuesJs.ftl Wed Aug 25 08:28:22 2010
@@ -22,7 +22,7 @@ Event.observe(window, 'load', function()
         Event.observe($('${dependentForm}_${mainId}'), 'change', function() {
             getDependentDropdownValues('${requestName}', '${mainId}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '', '');
         });
-        getDependentDropdownValues('${requestName}', '${mainId}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '${selectedDependentOption}', '');
+        getDependentDropdownValues('${requestName}', '${paramKey}', '${dependentForm}_${mainId}', '${dependentForm}_${dependentId}', '${responseName}', '${dependentId}', '${descName}', '${selectedDependentOption}', '');
     }
 })
 </script>
\ No newline at end of file

Modified: ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml Wed Aug 25 08:28:22 2010
@@ -41,6 +41,14 @@
         <value xml:lang="th">ตัวอย่างโปรแกรมคอมพิวเตอร์</value>
         <value xml:lang="zh">样例应用</value>
     </property>
+    <property key="ExampleBirtChartReport">
+        <value xml:lang="en">HTML chart report</value>
+        <value xml:lang="fr">Graphiques HTML</value>
+    </property>
+    <property key="ExampleBirtChartViewHandler">
+        <value xml:lang="en">PDF chart report</value>
+        <value xml:lang="fr">Graphiques PDF</value>
+    </property>
     <property key="ExampleBirtReport">
         <value xml:lang="en">HTML</value>
     </property>

Modified: ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/framework/example/webapp/birt/WEB-INF/controller.xml Wed Aug 25 08:28:22 2010
@@ -70,6 +70,15 @@ under the License.
         <response name="success" type="view" value="ViewHandler"/>
     </request-map>
 
+    <request-map uri="chartReport">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="chartReport"/>
+    </request-map>
+    <request-map uri="chartViewHandler">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="chartViewHandler"/>
+    </request-map>
+
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -86,5 +95,8 @@ under the License.
         application/vnd.ms-powerpoint
      -->
     <view-map name="ViewHandler" type="birt" page="component://example/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
+    
+    <view-map name="chartViewHandler" type="birt" page="component://example/webapp/birt/report/chart.rptdesign" content-type="application/pdf"/>
+    <view-map name="chartReport" type="screen" page="component://example/widget/example/BirtScreens.xml#chartReport"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml Wed Aug 25 08:28:22 2010
@@ -25,6 +25,7 @@ under the License.
          elements found in the common-controller.xml file. -->
     <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
     <include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
+    <include location="component://example/webapp/birt/WEB-INF/controller.xml"/>
 
     <description>Example Component Site Configuration File</description>
     
@@ -222,24 +223,8 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="BirtMain"/>
     </request-map>
-    <request-map uri="Report">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Report"/>
-    </request-map>
-    <request-map uri="Mail">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Mail"/>
-    </request-map>
-    <request-map uri="sendBirtMail">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="sendBirtMail"/>
-        <response name="success" type="view" value="Mail"/>
-        <response name="error" type="view" value="Mail"/>
-    </request-map>
-    <request-map uri="ViewHandler">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewHandler"/>
-    </request-map>
+
+    <!--flotr example requests-->
     <request-map uri="ExampleBarChart">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ExampleBarChart"/>
@@ -288,9 +273,6 @@ under the License.
 
     <!-- Birt example View Mappings -->
     <view-map name="BirtMain" type="screen" page="component://example/widget/example/BirtScreens.xml#main"/>
-    <view-map name="Report" type="screen" page="component://example/widget/example/BirtScreens.xml#Report"/>
-    <view-map name="Mail" type="screen" page="component://example/widget/example/BirtScreens.xml#EditMail"/>
-    <view-map name="ViewHandler" type="birt" page="component://example/webapp/birt/report/example.rptdesign" content-type="application/pdf"/>
 
     <!-- Flotr view mapping -->
     <view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/>

Modified: ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml Wed Aug 25 08:28:22 2010
@@ -87,4 +87,27 @@ under the License.
             </widgets>
         </section>
     </screen>
+
+    <screen name="chartReport">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="chartReport"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <screenlet title="Using report tag">
+                                    <platform-specific>
+                                        <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html>
+                                    </platform-specific>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml Wed Aug 25 08:28:22 2010
@@ -85,6 +85,9 @@ under the License.
         <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item>
         <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler"/></menu-item>
         <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item>
+        <!-- Reports using charts-->
+        <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item>
+        <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler} (not working)"><link target="chartViewHandler"/></menu-item>
     </menu>
 
     <menu name="ExampleCharts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml Wed Aug 25 08:28:22 2010
@@ -56,7 +56,8 @@ under the License.
                                             <!-- setCountryStatesEventJs.ftl, it's not used here but is a good example of a reusable template-script with harcoded values which make sense -->
                                             <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? -->
                                             <set field="dependentForm" value="DropDownFieldsExampleForm"/>
-                                            <set field="mainId" value="countryGeoId"/><!-- here mainId and its key are same -->
+                                            <set field="paramKey" value="countryGeoId"/>                                            
+                                            <set field="mainId" value="countryGeoId"/>
                                             <set field="dependentId" value="stateProvinceGeoId"/>
                                             <set field="requestName" value="getAssociatedStateList"/>
                                             <set field="responseName" value="stateList"/>

Modified: ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/CommonScreens.xml Wed Aug 25 08:28:22 2010
@@ -91,7 +91,7 @@ under the License.
     <screen name="browsercerts">
         <section>
             <actions>
-                <set field="headerItem" value="main"/>
+                <set field="tabButtonItem" value="myCertificates"/>
                 <set field="titleProperty" value="WebtoolsCertsX509"/>
             </actions>
             <widgets>

Modified: ofbiz/branches/jquery/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/TempExprScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/TempExprScreens.xml Wed Aug 25 08:28:22 2010
@@ -24,7 +24,7 @@ under the License.
     <screen name="TemporalExpressionDecorator">
         <section>
             <actions>
-                <set field="headerItem" value="tempexpr"/>
+                <set field="tabButtonItem" value="tempexpr"/>
                 <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap[titleProperty]}" global="true"/>
             </actions>

Modified: ofbiz/branches/jquery/framework/webtools/widget/tempExprForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/tempExprForms.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/tempExprForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/tempExprForms.xml Wed Aug 25 08:28:22 2010
@@ -39,26 +39,28 @@ under the License.
 
     <form name="BasicExpressionList" type="list"
          default-table-style="basic-table hover-bar" odd-row-style="alternate-row" header-row-style="header-row-2">
-        <field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}">
+        <field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}" sort-field="true">
             <hyperlink also-hidden="false" target-type="plain" description="${tempExprId}" target="editTemporalExpression">
                 <parameter param-name="tempExprId"/>
             </hyperlink>
         </field>
-        <field name="tempExprTypeId" title="${uiLabelMap.TemporalExpressionType}"><display/></field>
-        <field name="description"><display/></field>
-        <field name="date1"><display/></field>
-        <field name="date2"><display/></field>
-        <field name="integer1"><display/></field>
-        <field name="integer2"><display/></field>
-        <field name="string1"><display/></field>
-        <field name="string2"><display/></field>
+        <field name="tempExprTypeId" title="${uiLabelMap.TemporalExpressionType}" sort-field="true"><display/></field>
+        <field name="description" sort-field="true"><display/></field>
+        <field name="date1" sort-field="true"><display/></field>
+        <field name="date2" sort-field="true"><display/></field>
+        <field name="integer1" sort-field="true"><display/></field>
+        <field name="integer2" sort-field="true"><display/></field>
+        <field name="string1" sort-field="true"><display/></field>
+        <field name="string2" sort-field="true"><display/></field>
     </form>
 
     <form name="ListTemporalExpressions" extends="BasicExpressionList" list-name="listIt" paginate="true">
         <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="tempExprId"/>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="TemporalExpression"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>

Modified: ofbiz/branches/jquery/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/macros.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/macros.xml (original)
+++ ofbiz/branches/jquery/macros.xml Wed Aug 25 08:28:22 2010
@@ -50,7 +50,7 @@ under the License.
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/commons/commons-cli-1.0.jar"/>
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/>
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/>
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-1.7.3.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-1.7.4.jar"/>
  </path>
  <path id="ant.lib.class.path">
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/forum/forums.ftl Wed Aug 25 08:28:22 2010
@@ -23,7 +23,7 @@ under the License.
           <ul class="browsecategorylist">
             <#list forums as forum>
             <li class="browsecategorytext">
-               <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" class="browsecategorybutton">${forum.contentName}</a>
+               <a href="<@ofbizUrl>showforum?forumId=${forum.contentId}</@ofbizUrl>" class="browsecategorybutton">${forum.contentName!forum.contentId}</a>
             </li>
             </#list>
           </ul>

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 25 08:28:22 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-987448
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-988870

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 25 08:28:22 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-987448
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-988870

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 25 08:28:22 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-987448
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-988870

Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/CommonScreens.xml Wed Aug 25 08:28:22 2010
@@ -64,6 +64,19 @@ under the License.
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
+                                    <not><if-empty field="project"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <include-menu name="ProjectTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -77,7 +90,6 @@ under the License.
                                         </not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="ProjectTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
                                         <include-menu name="ProjectSubTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
                                         <container style="clear"/>
                                         <label style="h1" text="${uiLabelMap.ProjectMgrProjectCurrent}: ${project.workEffortName}[${project.workEffortId}]"/>
@@ -104,6 +116,19 @@ under the License.
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <condition>
+                                <and>
+                                    <if-has-permission permission="PROJECTMGR" action="_VIEW"/>
+                                    <not><if-empty field="workEffort"/></not>
+                                </and>
+                            </condition>
+                            <widgets>
+                                <include-menu name="TaskTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -115,7 +140,6 @@ under the License.
                                         <not><if-empty field="workEffort"/></not>
                                     </condition>
                                     <widgets>
-                                        <include-menu name="TaskTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
                                         <include-menu name="TaskSubTabBar" location="component://projectmgr/widget/ProjectMenus.xml"/>
                                         <container style="clear"/>
                                         <label style="h1" text="${uiLabelMap.ProjectMgrTaskCurrent}: ${workEffort.workEffortName}[${workEffort.workEffortId}] ${uiLabelMap.ProjectMgrPhaseName}: ${phaseName} ${uiLabelMap.ProjectMgrProjectName}: ${projectName}"/>

Modified: ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl?rev=988875&r1=988874&r2=988875&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl Wed Aug 25 08:28:22 2010
@@ -78,11 +78,11 @@ under the License.
         </li>
       </#if>
     </#if>
-    <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
-      <#include "component://common/webcommon/includes/helplink.ftl" />
-      <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
-    </#if>
     <#if userLogin?exists>
+      <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
+        <#include "component://common/webcommon/includes/helplink.ftl" />
+        <li><a class="help-link <#if pageAvail?has_content> alert</#if>" href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&amp;portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);" title="${uiLabelMap.CommonHelp}"></a></li>
+      </#if>
       <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
       <li><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
     <#else>