svn commit: r1356450 [4/10] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/ applications/accounting/config/ applications/accounting/script/org/ofbiz/accounting/rate/ applications/accounting/webapp/accounting/WEB-INF/ applicatio...

[erwan]

Modified: ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/src/org/ofbiz/base/conversion/DateTimeConverters.java Mon Jul  2 20:11:49 2012
@@ -26,6 +26,7 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.TimeDuration;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilValidate;
@@ -39,6 +40,11 @@ public class DateTimeConverters implemen
             super(Calendar.class, Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public Date convert(Calendar obj) throws ConversionException {
             return obj.getTime();
         }
@@ -72,6 +78,11 @@ public class DateTimeConverters implemen
             super(Calendar.class, Timestamp.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public Timestamp convert(Calendar obj) throws ConversionException {
             return new Timestamp(obj.getTimeInMillis());
         }
@@ -102,11 +113,31 @@ public class DateTimeConverters implemen
             super(java.util.Date.class, java.sql.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Date convert(java.util.Date obj) throws ConversionException {
             return new java.sql.Date(obj.getTime());
         }
     }
 
+    public static class DateToSqlTime extends AbstractConverter<java.util.Date, java.sql.Time> {
+        public DateToSqlTime() {
+            super(java.util.Date.class, java.sql.Time.class);
+        }
+
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
+        public java.sql.Time convert(java.util.Date obj) throws ConversionException {
+            return new java.sql.Time(obj.getTime());
+        }
+    }
+
     public static class DateToString extends GenericLocalizedConverter<java.util.Date, String> {
         public DateToString() {
             super(java.util.Date.class, String.class);
@@ -133,6 +164,11 @@ public class DateTimeConverters implemen
             super(java.util.Date.class, java.sql.Timestamp.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Timestamp convert(java.util.Date obj) throws ConversionException {
             return new java.sql.Timestamp(obj.getTime());
         }
@@ -237,6 +273,11 @@ public class DateTimeConverters implemen
             super(Number.class, java.util.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.util.Date convert(Number obj) throws ConversionException {
              return new java.util.Date(obj.longValue());
         }
@@ -257,6 +298,11 @@ public class DateTimeConverters implemen
             super(Number.class, java.sql.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Date convert(Number obj) throws ConversionException {
              return new java.sql.Date(obj.longValue());
         }
@@ -267,6 +313,11 @@ public class DateTimeConverters implemen
             super(Number.class, java.sql.Time.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Time convert(Number obj) throws ConversionException {
              return new java.sql.Time(obj.longValue());
         }
@@ -277,6 +328,11 @@ public class DateTimeConverters implemen
             super(Number.class, java.sql.Timestamp.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Timestamp convert(Number obj) throws ConversionException {
              return new java.sql.Timestamp(obj.longValue());
         }
@@ -287,6 +343,11 @@ public class DateTimeConverters implemen
             super(java.sql.Date.class, java.util.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.util.Date convert(java.sql.Date obj) throws ConversionException {
             return new java.util.Date(obj.getTime());
         }
@@ -330,6 +391,11 @@ public class DateTimeConverters implemen
             super(java.sql.Date.class, java.sql.Time.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Time convert(java.sql.Date obj) throws ConversionException {
             throw new ConversionException("Conversion from Date to Time not supported");
        }
@@ -340,6 +406,11 @@ public class DateTimeConverters implemen
             super(java.sql.Date.class, java.sql.Timestamp.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Timestamp convert(java.sql.Date obj) throws ConversionException {
             return new java.sql.Timestamp(obj.getTime());
        }
@@ -362,6 +433,11 @@ public class DateTimeConverters implemen
             super(java.sql.Time.class, java.sql.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Date convert(java.sql.Time obj) throws ConversionException {
             throw new ConversionException("Conversion from Time to Date not supported");
         }
@@ -474,6 +550,11 @@ public class DateTimeConverters implemen
             super(String.class, java.sql.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Date convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
             String trimStr = obj.trim();
             if (trimStr.length() == 0) {
@@ -498,6 +579,11 @@ public class DateTimeConverters implemen
             super(String.class, java.sql.Time.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Time convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
             String trimStr = obj.trim();
             if (trimStr.length() == 0) {
@@ -522,6 +608,11 @@ public class DateTimeConverters implemen
             super(String.class, java.sql.Timestamp.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return ObjectType.instanceOf(sourceClass, this.getSourceClass()) && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Timestamp convert(String obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
             String str = obj.trim();
             if (str.length() == 0) {
@@ -587,6 +678,11 @@ public class DateTimeConverters implemen
             super(java.sql.Timestamp.class, java.util.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.util.Date convert(java.sql.Timestamp obj) throws ConversionException {
             return new java.sql.Timestamp(obj.getTime());
         }
@@ -609,11 +705,31 @@ public class DateTimeConverters implemen
             super(java.sql.Timestamp.class, java.sql.Date.class);
         }
 
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
         public java.sql.Date convert(java.sql.Timestamp obj) throws ConversionException {
             return new java.sql.Date(obj.getTime());
         }
     }
 
+    public static class TimestampToSqlTime extends AbstractConverter<java.sql.Timestamp, java.sql.Time> {
+        public TimestampToSqlTime() {
+            super(java.sql.Timestamp.class, java.sql.Time.class);
+        }
+
+        @Override
+        public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
+            return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
+        }
+
+        public java.sql.Time convert(java.sql.Timestamp obj) throws ConversionException {
+            return new java.sql.Time(obj.getTime());
+        }
+    }
+
     public static class TimeZoneToString extends AbstractConverter<TimeZone, String> {
         public TimeZoneToString() {
             super(TimeZone.class, String.class);

Modified: ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/bi/ofbiz-component.xml Mon Jul  2 20:11:49 2012
@@ -25,8 +25,7 @@ under the License.
     <classpath type="dir" location="config"/>
     <classpath type="jar" location="build/lib/*"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/BiTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/BiSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/BiSecurityData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
 

Modified: ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/ofbiz-component.xml Mon Jul  2 20:11:49 2012
@@ -27,8 +27,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_olap.xml"/>
     <entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup_olap.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/CommonSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonSystemPropertyData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/CountryCodeData.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml Mon Jul  2 20:11:49 2012
@@ -41,9 +41,6 @@ under the License.
     <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
     <handler name="screentext" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
     <handler name="screencsv" type="view" class="org.ofbiz.widget.screen.MacroScreenViewHandler"/>
-    <!--handler name="screen" type="view" class="org.ofbiz.widget.screen.ScreenWidgetViewHandler"/>
-    <handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/>
-    <handler name="screentext" type="view" class="org.ofbiz.widget.screen.ScreenTextViewHandler"/-->
     <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
@@ -210,8 +207,7 @@ under the License.
     <!-- Lookup requests -->
     <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
     <request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map>
-    <request-map uri="LookupLocale"><security https="true" auth="true"/><response name="success" type="view" value="LookupLocale"/></request-map>
-    
+
     <!--========================== AJAX events =====================-->
     <!-- Get states related to a country -->
     <request-map uri="getAssociatedStateList">
@@ -283,5 +279,4 @@ under the License.
     
     <view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/>
     <view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/>
-    <view-map name="LookupLocale" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocale"/>
 </site-conf>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Bars.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Bars.ftl Mon Jul  2 20:11:49 2012
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>"></script>
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
 
 <div id="${chartId}Div" style="width:600px;height:300px;"></div>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Pie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/flotCharts/Pie.ftl Mon Jul  2 20:11:49 2012
@@ -17,7 +17,7 @@ specific language governing permissions
 under the License.
 -->
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>"></script>
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script>
 

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/lookup.ftl?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/includes/lookup.ftl Mon Jul  2 20:11:49 2012
@@ -34,12 +34,12 @@ under the License.
         if (typeof(jQuery) == 'undefined') {
             if (!jQueryLibLoaded) {
                 jQueryLibLoaded = true;
-                document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>\"></scr" + "ipt>");
+                document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>\"></scr" + "ipt>");
             }
             setTimeout("initJQuery()", 50);
         }
     }
-    initJQuery();
+    initJQuery();
     //]]></script>
     <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script>
     <#if layoutSettings.javaScripts?has_content>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/CommonScreens.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/CommonScreens.xml Mon Jul  2 20:11:49 2012
@@ -143,18 +143,16 @@ under the License.
                 <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true" />
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true" />
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true" />
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true" />
-                <set field="layoutSettings.javaScripts[+0]" value="/images/portlet.js" global="true"/><!--#Eam# portletWidget -->
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true" />
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true" />
                 <!-- jQuery CSSs -->
                 <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" />
-                <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true" />
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true" />
                 <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true" />
                 <set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true" />
@@ -186,10 +184,6 @@ under the License.
                         <set field="appbarOpenTemplateLocation" from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]" />
                         <set field="appbarCloseTemplateLocation" from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]" />
                         <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" />
-                        <!--#Bam# icons-purpose-->
-                        <set field="iconsPurposeProp" from-field="layoutSettings.VT_ICONS_PURP[0]" default-value="iconsPurpose"/>
-                        <property-map resource="${iconsPurposeProp}" map-name="iconsPurpose" global="true" />
-                        <!--#Eam# icons-purpose-->
                         <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
                     </actions>
                     <widgets />
@@ -393,10 +387,6 @@ under the License.
                         <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
 
                         <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
-                        <!--#Bam# icons-purpose-->
-                        <set field="iconsPurposeProp" from-field="layoutSettings.VT_ICONS_PURP[0]" default-value="iconsPurpose"/>
-                        <property-map resource="${iconsPurposeProp}" map-name="iconsPurpose" global="true" />
-                        <!--#Eam# icons-purpose-->
                     </actions>
                     <widgets>
                         <section>
@@ -481,17 +471,15 @@ under the License.
                 <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/>
 
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.7.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/portlet.js" global="true"/><!--#Eam# portletWidget -->
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/>
                     <!-- jQuery CSSs -->
                 <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/>
-                <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/>
 
 
 
@@ -503,10 +491,6 @@ under the License.
                 <!-- The settings below are used for xsl-fo screens -->
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="logoImageUrl" value="/images/ofbiz_logo.gif"/>
-                <!--#Bam# icons-purpose-->
-                <set field="iconsPurposeProp" from-field="layoutSettings.VT_ICONS_PURP[0]" default-value="iconsPurpose"/>
-                <property-map resource="${iconsPurposeProp}" map-name="iconsPurpose" global="true" />
-                <!--#Eam# icons-purpose-->
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -713,71 +697,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-
-    <!--#Bam# portletUiLabelDecorator : manage standard portlet decorator -->
-    <screen name="uiLabelDecorator">
-        <section>
-            <actions>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true" />
-                <property-map resource="general" map-name="generalProperties" global="true"/>
-                <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
-                <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
-                <service service-name="getVisualThemeResources">
-                    <field-map field-name="visualThemeId"/>
-                    <field-map field-name="themeResources" from-field="layoutSettings"/>
-                </service>
-                <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
-                <set field="iconsLocation" from-field="layoutSettings.VT_ICONS_LOC[0]" default-value="/images/icons/famfamfam" global="true"/>
-                <set field="iconsPurposeProp" from-field="layoutSettings.VT_ICONS_PURP[0]" default-value="iconsPurpose"/>
-                <property-map resource="${iconsPurposeProp}" map-name="iconsPurpose" global="true" />
-            </actions>
-            <widgets>
-              <section>
-                <condition>
-                  <if-empty field="includedInPage"/>
-                </condition>
-                <widgets>
-                  <platform-specific>
-                    <html>
-                        <html-template location="component://common/webcommon/includes/messages.ftl" />
-                    </html>
-                  </platform-specific>
-                </widgets>
-              </section>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="portletUiLabelDecorator">
-      <section>
-        <widgets>
-          <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
-              <decorator-section name="body">
-                <decorator-section-include name="body" />
-              </decorator-section>
-          </decorator-screen>
-        </widgets>
-      </section>
-    </screen>
-    <!--  can be use for all portalPage build like exampleMgmt  -->
-    <screen name="ShowCommonDetailPortlet">
-        <section>
-            <actions>
-                <set field="defaultdetailPortletId" from-field="detailCommonPortletId" from-scope="user" default-value="CommonInfo"/>
-                <set field="portalPortletId" from-field="parameters.portalPortletId" default-value="${defaultdetailPortletId}"/>
-                <set field="detailCommonPortletId" from-field="portalPortletId" to-scope="user"/>
-                <set field="portalPageId" from-field="parameters.portalPageId"/>
-                <set field="parameters.areaId" value="PP_${portalPageId}CommonDetail00001"/>
-                <set field="portletSeqId" from-field="parameters.portletSeqId" default-value="00001"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="portletUiLabelDecorator">
-                    <decorator-section name="body">
-                      <include-portal-page id="${portalPageId}" portalPortletId="${portalPortletId}" portletSeqId="${portletSeqId}"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <!--#Eam# portletUiLabelDecorator -->
 </screens>

Propchange: ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
  Merged /ofbiz/trunk/framework/common/widget/HelpScreens.xml:r1347755-1351865

Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupForms.xml Mon Jul  2 20:11:49 2012
@@ -115,17 +115,4 @@ under the License.
         </field>
     </form>
 
-    <form name="LookupLocale" type="single" target="LookupLocale">
-        <field name="localeString"><text-find hide-options="true"/></field>
-        <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find hide-options="true"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
-    </form>
-
-    <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="localeString" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/>
-        </field>
-        <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field>
-    </form>
 </forms>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/widget/LookupScreens.xml Mon Jul  2 20:11:49 2012
@@ -225,28 +225,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-
-    <screen name="LookupLocale">
-        <section>
-            <actions>
-                <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="title" value="${uiLabelMap.CommonLookupLocale}"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
-                <set field="inputFields" from-field="parameters"/>
-                <script location="component://common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
-                    <decorator-section name="search-options">
-                        <include-form name="LookupLocale" location="component://common/widget/LookupForms.xml"/>
-                    </decorator-section>
-                    <decorator-section name="search-results">
-                        <include-form name="ListLocales" location="component://common/widget/LookupForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>

Modified: ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml Mon Jul  2 20:11:49 2012
@@ -98,7 +98,6 @@ access. For a detailed description see t
 
     <!-- need to at least define a name for each component to use -->
     <!-- defining:
-        security     = OFBiz security group and security permissions. are required to show a component.
         tenant       = OFBiz and External Tenant Data
         seed         = OFBiz and External Seed Data - to be maintained along with source and updated whenever a system deployment is updated
         security     = OFBiz security group and security permissions. are required to show a component.
@@ -108,7 +107,6 @@ access. For a detailed description see t
         ext-test     = External Test Data (custom)
         ext-demo     = External Demo Data (custom)
     -->
-    <entity-data-reader name="security"/>
     <entity-data-reader name="tenant"/>
     <entity-data-reader name="seed"/>
     <entity-data-reader name="security"/>
@@ -157,7 +155,6 @@ access. For a detailed description see t
             use-fk-initially-deferred="false"
             join-style="ansi-no-parenthesis"
             alias-view-columns="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -188,7 +185,6 @@ access. For a detailed description see t
             use-indices-unique="false"
             alias-view-columns="false"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -240,7 +236,6 @@ access. For a detailed description see t
             alias-view-columns="false"
             use-order-by-nulls="true">
         <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index -->
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -268,7 +263,6 @@ access. For a detailed description see t
         use-indices-unique="false"
         alias-view-columns="false"
         use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -293,7 +287,6 @@ access. For a detailed description see t
             field-type-name="daffodil"
             check-on-start="true"
             add-missing-on-start="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -320,7 +313,6 @@ access. For a detailed description see t
             check-on-start="true"
             add-missing-on-start="true"
             use-pk-constraint-names="false">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -351,7 +343,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -384,7 +375,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -417,7 +407,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -450,7 +439,6 @@ access. For a detailed description see t
             table-type="InnoDB"
             character-set="latin1"
             collate="latin1_general_cs">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -480,7 +468,6 @@ access. For a detailed description see t
             <!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later:
                 result-fetch-size="50"
             -->
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -520,7 +507,6 @@ access. For a detailed description see t
         result-fetch-size="50"
         use-binary-type-for-blob="true"
         use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -556,7 +542,6 @@ access. For a detailed description see t
             result-fetch-size="50"
             use-binary-type-for-blob="true"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -592,7 +577,6 @@ access. For a detailed description see t
             result-fetch-size="50"
             use-binary-type-for-blob="true"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -626,7 +610,6 @@ access. For a detailed description see t
             alias-view-columns="false"
             join-style="ansi"
             use-order-by-nulls="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -669,7 +652,6 @@ access. For a detailed description see t
             add-missing-on-start="true"
             use-fk-initially-deferred="false"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -695,7 +677,6 @@ access. For a detailed description see t
             fk-style="name_fk"
             use-fk-initially-deferred="false"
             join-style="ansi-no-parenthesis">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -725,7 +706,6 @@ access. For a detailed description see t
             add-missing-on-start="true"
             alias-view-columns="false"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -770,7 +750,6 @@ access. For a detailed description see t
             join-style="ansi"
             alias-view-columns="false"
             use-fk-initially-deferred="false">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -796,7 +775,6 @@ access. For a detailed description see t
             check-on-start="true"
             add-missing-on-start="true"
             join-style="ansi">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>
@@ -826,7 +804,6 @@ access. For a detailed description see t
             join-style="ansi-no-parenthesis"
             alias-view-columns="false"
             always-use-constraint-keyword="true">
-        <read-data reader-name="security"/>
         <read-data reader-name="tenant"/>
         <read-data reader-name="seed"/>
         <read-data reader-name="security"/>

Modified: ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entityext/ofbiz-component.xml Mon Jul  2 20:11:49 2012
@@ -29,15 +29,8 @@ under the License.
     
     <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtTypeData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/EntityScheduledServices.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/EntityExtSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/EntityExtSecurityData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="group" loader="main" location="servicedef/groups.xml"/>
-
-    <!-- load the data load container, runs the entity data load stuff -->
-    <container name="dataload-container" loaders="install" class="org.ofbiz.entityext.data.EntityDataLoadContainer">
-        <property name="delegator-name" value="default"/>
-        <property name="entity-group-name" value="org.ofbiz"/>
-    </container>
 </ofbiz-component>

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-he.js Mon Jul  2 20:11:49 2012
@@ -2,7 +2,7 @@
 /* Written by Lior Lapid */
 (function($) {
  $.timepicker.regional["he"] = {
- timeOnlyTitle: "בחרית זמן",
+ timeOnlyTitle: "בחירת זמן",
  timeText: "שעה",
  hourText: "שעות",
  minuteText: "דקות",

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js Mon Jul  2 20:11:49 2012
@@ -8,8 +8,8 @@
  minuteText: 'Минуты',
  secondText: 'Секунды',
  millisecText: 'Миллисекунды',
- timezoneText: 'Время зоны',
- currentText: 'Теперь',
+ timezoneText: 'Часовой пояс',
+ currentText: 'Сейчас',
  closeText: 'Закрыть',
  timeFormat: 'hh:mm tt',
  amNames: ['AM', 'A'],

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js Mon Jul  2 20:11:49 2012
@@ -5,15 +5,15 @@
  timeOnlyTitle: 'Zvoľte čas',
  timeText: 'Čas',
  hourText: 'Hodiny',
- minuteText: 'Minuty',
+ minuteText: 'Minúty',
  secondText: 'Sekundy',
  millisecText: 'Milisekundy',
  timezoneText: 'Časové pásmo',
  currentText: 'Teraz',
- closeText: 'Zavřít',
+ closeText: 'Zavrieť',
  timeFormat: 'h:m',
  amNames: ['dop.', 'AM', 'A'],
- pmNames: ['odp.', 'PM', 'P'],
+ pmNames: ['pop.', 'PM', 'P'],
  ampm: false
  };
  $.timepicker.setDefaults($.timepicker.regional['sk']);

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js Mon Jul  2 20:11:49 2012
@@ -1,5 +1,5 @@
 /* Turkish translation for the jQuery Timepicker Addon */
-/* Written by Fehmi Can Saglam */
+/* Written by Fehmi Can Saglam, Edited by Goktug Ozturk */
 (function($) {
  $.timepicker.regional['tr'] = {
  timeOnlyTitle: 'Zaman Seçiniz',
@@ -7,13 +7,13 @@
  hourText: 'Saat',
  minuteText: 'Dakika',
  secondText: 'Saniye',
- millisecText: 'Milisaniyelik',
+ millisecText: 'Milisaniye',
  timezoneText: 'Zaman Dilimi',
  currentText: 'Şu an',
  closeText: 'Tamam',
  timeFormat: 'hh:mm',
- amNames: ['AM', 'A'],
- pmNames: ['PM', 'P'],
+ amNames: ['ÖÖ', 'Ö'],
+ pmNames: ['ÖS', 'S'],
  ampm: false
  };
  $.timepicker.setDefaults($.timepicker.regional['tr']);

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js Mon Jul  2 20:11:49 2012
@@ -1,17 +1,20 @@
-/* Chinese translation for the jQuery Timepicker Addon */
-/* Written by Leon Sun */
+/* Simplified Chinese translation for the jQuery Timepicker Addon /
+/ Written by Will Lu */
 (function($) {
-    $.timepicker.regional['zh-CN'] = {
-        timeOnlyTitle: '选择时间',
-        timeText: '时间',
-        hourText: '时',
-        minuteText: '分',
-        secondText: '秒',
-        timezoneText: '时区',
-        currentText: '现在',
-        closeText: '完成',
-        timeFormat: 'hh:mm',
-        ampm: false
-    };
-    $.timepicker.setDefaults($.timepicker.regional['zh-CN']);
+ $.timepicker.regional['zh-CN'] = {
+ timeOnlyTitle: '选择时间',
+ timeText: '时间',
+ hourText: '小时',
+ minuteText: '分钟',
+ secondText: '秒钟',
+ millisecText: '微秒',
+ timezoneText: '时区',
+ currentText: '现在时间',
+ closeText: '关闭',
+ timeFormat: 'hh:mm',
+ amNames: ['AM', 'A'],
+ pmNames: ['PM', 'P'],
+ ampm: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['zh-CN']);
 })(jQuery);

Modified: ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js?rev=1356450&r1=1356449&r2=1356450&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js (original)
+++ ofbiz/branches/20120329_portletWidget/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-TW.js Mon Jul  2 20:11:49 2012
@@ -1,17 +1,20 @@
 /* Chinese translation for the jQuery Timepicker Addon */
-/* Written by Leon Sun */
+/* Written by Alang.lin */
 (function($) {
-    $.timepicker.regional['zh-TW'] = {
-        timeOnlyTitle: '選擇時間',
-        timeText: '時間',
-        hourText: '時',
-        minuteText: '分',
-        secondText: '秒',
-        timezoneText: '時區',
-        currentText: '現在',
-        closeText: '完成',
-        timeFormat: 'hh:mm',
-        ampm: false
-    };
-    $.timepicker.setDefaults($.timepicker.regional['zh-TW']);
+ $.timepicker.regional['zh-TW'] = {
+ timeOnlyTitle: '選擇時分秒',
+ timeText: '時間',
+ hourText: '時',
+ minuteText: '分',
+ secondText: '秒',
+ millisecText: '毫秒',
+ timezoneText: '時區',
+ currentText: '現在時間',
+ closeText: '確定',
+ timeFormat: 'hh:mm tt',
+ amNames: ['上午', 'AM', 'A'],
+ pmNames: ['下午', 'PM', 'P'],
+ ampm: false
+ };
+ $.timepicker.setDefaults($.timepicker.regional['zh-TW']);
 })(jQuery);