Commit 296c2eee authored by holivier's avatar holivier

update with ofbiz svn 1853223

parent 067fef86
......@@ -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>
......@@ -1223,4 +1232,4 @@
<value xml:lang="zh">你修改了选择框中的值</value>
<value xml:lang="zh-TW">你修改了選擇框中的值</value>
</property>
</resource>
\ No newline at end of file
</resource>
......@@ -83,6 +83,9 @@ under the License.
</servlet>
<servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
</session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
......
......@@ -28,11 +28,10 @@ under the License.
<!-- ***************** -->
<!-- *** field1 *** -->
<!-- ***************** -->
<field name="field1"
title="${uiLabelMap.ExampleDateField1Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<!-- <field name="field1"
title="${uiLabelMap.ExampleDateField1Title}">
<date-time mask="Y"/>
</field>
</field> -->
<!-- ***************** -->
<!-- *** field9 *** -->
<!-- ***************** -->
......@@ -61,19 +60,10 @@ under the License.
<!-- *** field2 *** -->
<!-- ***************** -->
<field name="field2"
title="${uiLabelMap.ExampleDateField2Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
title="${uiLabelMap.ExampleDateField2Title}">
<date-time type="date"/>
</field>
<!-- ***************** -->
<!-- *** field3 *** -->
<!-- ***************** -->
<field name="field3"
title="${uiLabelMap.ExampleDateField3Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<date-time type="time"/>
</field>
<!-- ***************** -->
<!-- *** field4 *** -->
<!-- ***************** -->
<field name="field4"
......@@ -94,8 +84,7 @@ under the License.
<!-- ***************** -->
<field name="field6"
entry-name="exampleDateField"
title="${uiLabelMap.ExampleDateField6Title}"
tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
title="${uiLabelMap.ExampleDateField6Title}">
<display type="date-time"/>
</field>
<!-- ***************** -->
......@@ -124,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="">
......@@ -425,7 +435,7 @@ under the License.
<!-- *** Layered-modal *** -->
<!-- ************************ -->
<actions>
<set field="targetUrl" value="javascript:sendJWT('${webappName}', 'https://demo-trunk.ofbiz.apache.org/content/control/main')"/>
<set field="targetUrl" value="javascript:sendJWT('https://demo-trunk.ofbiz.apache.org/content/control/main')"/>
</actions>
<field name="emptyField0" title=" "><display/></field>
<field name="newExample" title=" " widget-area-style="smallSubmit" position="1">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment