Author: adityasharma
Date: Tue Jan 15 04:59:33 2019 New Revision: 1851318 URL: http://svn.apache.org/viewvc?rev=1851318&view=rev Log: Applied fix from trunk for revision: 1851316 === Improved: Replace Inline js with External js in renderDateFindField macro (OFBIZ-9850) Added an example in FormWidgetExamples for the field. Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 15 04:59:33 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316 Modified: ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml?rev=1851318&r1=1851317&r2=1851318&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/example/config/ExampleUiLabels.xml Tue Jan 15 04:59:33 2019 @@ -175,6 +175,15 @@ <value xml:lang="zh">使ç¨æ¥é¿=1 (缺ç), 5, 10, 15, 30</value> <value xml:lang="zh-TW">使ç¨æ¥é·=1 (é è¨), 5, 10, 15, 30</value> </property> + <property key="ExampleDateField13Title"> + <value xml:lang="en">Field13: Date Find Field (Default type: timestamp)</value> + </property> + <property key="ExampleDateField14Title"> + <value xml:lang="en">Field14: Date Find Field of type date</value> + </property> + <property key="ExampleDateField15Title"> + <value xml:lang="en">Field14: Date Find Field of type time</value> + </property> <property key="ExampleDateField1Title"> <value xml:lang="en">Field1: date and time selection field</value> <value xml:lang="fr">Champ 1 : sélection de date et temps</value> Modified: ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml?rev=1851318&r1=1851317&r2=1851318&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/example/widget/example/FormWidgetExampleForms.xml Tue Jan 15 04:59:33 2019 @@ -113,6 +113,27 @@ under the License. tooltip="${uiLabelMap.ExampleDateField12Tooltip}" tooltip-style="button-text"> <date-time input-method="time-dropdown" clock="24" default-value="${exampleDateField}" step="5"/> </field> + <!-- ***************** --> + <!-- *** field13 *** --> + <!-- ***************** --> + <field name="field13" + title="${uiLabelMap.ExampleDateField13Title}"> + <date-find/> + </field> + <!-- ***************** --> + <!-- *** field14 *** --> + <!-- ***************** --> + <field name="field14" + title="${uiLabelMap.ExampleDateField14Title}"> + <date-find type="date"/> + </field> + <!-- ***************** --> + <!-- *** field15 *** --> + <!-- ***************** --> + <field name="field15" + title="${uiLabelMap.ExampleDateField15Title}"> + <date-find type="time"/> + </field> </form> <form name="DropDownFieldsExampleForm" type="single" title=""> |
Free forum by Nabble | Edit this page |