From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 29 Apr 2013 23:54:15 +0000 (+0200)
Subject: Improved DatePicker with time support
X-Git-Tag: 2.0.0_Beta_1~271^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3d60ee7406577bfe36fb53191314c18320ba86a;p=GitHub%2FWoltLab%2FWCF.git

Improved DatePicker with time support
---

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 374d3658ac..7a34c9f113 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -57,6 +57,8 @@
 			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
 			'wcf.date.dateFormat': '{lang}wcf.date.dateFormat{/lang}',
 			'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
+			'wcf.date.hour': '{lang}wcf.date.hour{/lang}',
+			'wcf.date.minute': '{lang}wcf.date.minute{/lang}',
 			'wcf.date.timeFormat': '{lang}wcf.date.timeFormat{/lang}',
 			'wcf.global.button.add': '{lang}wcf.global.button.add{/lang}',
 			'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 7f7e0f14cb..9ca9398070 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -51,6 +51,8 @@
 				'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
 				'wcf.date.dateFormat': '{lang}wcf.date.dateFormat{/lang}',
 				'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
+				'wcf.date.hour': '{lang}wcf.date.hour{/lang}',
+				'wcf.date.minute': '{lang}wcf.date.minute{/lang}',
 				'wcf.date.timeFormat': '{lang}wcf.date.timeFormat{/lang}',
 				'wcf.global.button.add': '{lang}wcf.global.button.add{/lang}',
 				'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 40737f1049..a8ca282a0e 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -2369,9 +2369,12 @@ WCF.Date.Picker = {
 				dayNames: WCF.Language.get('__days'),
 				dayNamesMin: WCF.Language.get('__daysShort'),
 				dayNamesShort: WCF.Language.get('__daysShort'),
+				hourText: WCF.Language.get('wcf.date.hour'),
+				minuteText: WCF.Language.get('wcf.date.minute'),
 				monthNames: WCF.Language.get('__months'),
 				monthNamesShort: WCF.Language.get('__monthsShort'),
 				showButtonPanel: false,
+				showTime: false,
 				showOtherMonths: true,
 				timeFormat: this._timeFormat,
 				yearRange: ($input.hasClass('birthday') ? '-100:+0' : '1900:2038'),
diff --git a/wcfsetup/install/files/style/datePicker.less b/wcfsetup/install/files/style/datePicker.less
index 8d6e5b465b..b31c61f0a3 100644
--- a/wcfsetup/install/files/style/datePicker.less
+++ b/wcfsetup/install/files/style/datePicker.less
@@ -145,19 +145,11 @@
 			> dt {
 				margin-top: @wcfGapTiny !important;
 				width: 100px;
-				
-				&.ui_tpicker_time_label {
-					display: none;
-				}
 			}
 			
 			> dd {
 				margin-left: 120px;
 				margin-top: @wcfGapTiny !important;
-			
-				&.ui_tpicker_time {
-					display: none;
-				}
 			}
 		}
 	}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 2d69db590c..52717e1c84 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -825,6 +825,9 @@
 		<item name="wcf.date.relative.pastDays"><![CDATA[(($days > 1) ? '%day%' : 'Gestern' ) + ', %time%']]></item>
 		
 		<!-- variables for localized date formats -->
+		<item name="wcf.date.hour"><![CDATA[Stunde]]></item>
+		<item name="wcf.date.minute"><![CDATA[Minute]]></item>
+		
 		<item name="wcf.date.month.january"><![CDATA[Januar]]></item>
 		<item name="wcf.date.month.february"><![CDATA[Februar]]></item>
 		<item name="wcf.date.month.march"><![CDATA[März]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 58c834ae54..5a1e4d304c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -825,6 +825,9 @@
 		<item name="wcf.date.relative.pastDays"><![CDATA[(($days > 1) ? '%day%' : 'Yesterday' ) + ', %time%']]></item>
 		
 		<!-- variables for localized date formats -->
+		<item name="wcf.date.hour"><![CDATA[Hour]]></item>
+		<item name="wcf.date.minute"><![CDATA[Minute]]></item>
+		
 		<item name="wcf.date.month.january"><![CDATA[January]]></item>
 		<item name="wcf.date.month.february"><![CDATA[February]]></item>
 		<item name="wcf.date.month.march"><![CDATA[March]]></item>