Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7DD03737E for ; Wed, 7 Dec 2011 23:10:43 +0000 (UTC) Received: (qmail 45628 invoked by uid 500); 7 Dec 2011 23:10:43 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 45511 invoked by uid 500); 7 Dec 2011 23:10:43 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 45504 invoked by uid 99); 7 Dec 2011 23:10:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 23:10:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 23:10:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D315923888FD for ; Wed, 7 Dec 2011 23:10:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211698 - in /ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget: ./ src/org/ofbiz/widget/screen/MacroScreenRenderer.java templates/htmlFormMacroLibrary.ftl templates/htmlScreenMacroLibrary.ftl Date: Wed, 07 Dec 2011 23:10:20 -0000 To: commits@ofbiz.apache.org From: adrianc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207231020.D315923888FD@eris.apache.org> Author: adrianc Date: Wed Dec 7 23:10:19 2011 New Revision: 1211698 URL: http://svn.apache.org/viewvc?rev=1211698&view=rev Log: Screen Widget Redesign - merged trunk changes with branch. Modified: ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/ (props changed) ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlScreenMacroLibrary.ftl Propchange: ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Dec 7 23:10:19 2011 @@ -0,0 +1,5 @@ +/ofbiz/branches/addbirt/framework/widget:831210-885099,885686-886087 +/ofbiz/branches/dojo1.4/framework/widget:951708-952957 +/ofbiz/branches/jquery/framework/widget:952958-1044489 +/ofbiz/branches/multitenant20100310/framework/widget:921280-927264 +/ofbiz/trunk/framework/widget:1204170,1206013,1209250 Modified: ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1211698&r1=1211697&r2=1211698&view=diff ============================================================================== --- ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Wed Dec 7 23:10:19 2011 @@ -613,19 +613,17 @@ public class MacroScreenRenderer impleme fullUrlString = request.getRequestURI() + "?" + queryString; } } - if (!collapsed) { - StringWriter sb = new StringWriter(); - if (navMenu != null) { - MenuStringRenderer savedRenderer = (MenuStringRenderer) context.get("menuStringRenderer"); - MenuStringRenderer renderer = new ScreenletMenuRenderer(request, response); - context.put("menuStringRenderer", renderer); - navMenu.renderWidgetString(sb, context, this); - context.put("menuStringRenderer", savedRenderer); - } else if (navForm != null) { - renderScreenletPaginateMenu(sb, context, navForm); - } - menuString = sb.toString(); + StringWriter sb = new StringWriter(); + if (navMenu != null) { + MenuStringRenderer savedRenderer = (MenuStringRenderer) context.get("menuStringRenderer"); + MenuStringRenderer renderer = new ScreenletMenuRenderer(request, response); + context.put("menuStringRenderer", renderer); + navMenu.renderWidgetString(sb, context, this); + context.put("menuStringRenderer", savedRenderer); + } else if (navForm != null) { + renderScreenletPaginateMenu(sb, context, navForm); } + menuString = sb.toString(); } Map parameters = FastMap.newInstance(); Modified: ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1211698&r1=1211697&r2=1211698&view=diff ============================================================================== --- ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Dec 7 23:10:19 2011 @@ -137,17 +137,23 @@ under the License. jQuery("#${id}").change(function() { var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss"; - var dateObj = Date.parseExact(this.value, ofbizTime); - var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime; - var formatedObj = dateObj.toString(dateFormat); - jQuery("#${id}_i18n").val(formatedObj); + var newValue = "" + if (this.value != "") { + var dateObj = Date.parseExact(this.value, ofbizTime); + var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime; + newValue = dateObj.toString(dateFormat); + } + jQuery("#${id}_i18n").val(newValue); }); jQuery("#${id}_i18n").change(function() { var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime; - var dateObj = Date.parseExact(this.value, dateFormat); - var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss"; - var formatedObj = dateObj.toString(ofbizTime); - jQuery("#${id}").val(formatedObj); + var newValue = "" + if (this.value != "") { + var dateObj = Date.parseExact(this.value, dateFormat); + var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss"; + newValue = dateObj.toString(ofbizTime); + } + jQuery("#${id}").val(newValue); }); } else { <#-- fallback if no language specific js date file is found --> @@ -691,9 +697,9 @@ Parameter: lastViewName, String, optiona
  • ${paginateNextLabel}<#else>-disabled">${paginateNextLabel}
  • ${paginateLastLabel}<#else>-disabled">${paginateLastLabel}
    • <#if javaScriptEnabled>
  • ${paginateViewSizeLabel}
  • ${commonDisplaying}
    • Modified: ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlScreenMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1211698&r1=1211697&r2=1211698&view=diff ============================================================================== --- ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlScreenMacroLibrary.ftl (original) +++ ofbiz/branches/20111115ScreenWidgetRedesign/framework/widget/templates/htmlScreenMacroLibrary.ftl Wed Dec 7 23:10:19 2011 @@ -157,9 +157,12 @@ expanded">oncl >  +<#-- <#if !collapsed> ${menuString} + --> +${menuString}
    id="${collapsibleAreaId}" <#if collapsed> style="display: none;"<#if padded> class="screenlet-body"<#else> class="screenlet-body no-padding">