From d244ab7c79a45547f0f445938eb08f7c0eac3e8b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 20 Aug 2013 09:42:00 +0000 Subject: [PATCH] NOT using html5 input type="time", as there is (intentionally) no way to control time-format, but with current state of html5 support, our preference is more relyable and we dont want users to open bugs because we do not respect their EGroupware time-format preference --- etemplate/js/et2_widget_date.js | 4 ++-- etemplate/templates/default/etemplate2.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js index eedbd6e87b..2023616e96 100644 --- a/etemplate/js/et2_widget_date.js +++ b/etemplate/js/et2_widget_date.js @@ -64,8 +64,7 @@ var et2_date = et2_inputWidget.extend( this.span = $j(document.createElement("span")).addClass("et2_date"); this.input_date = $j(document.createElement("input")); - var type=(this._type == "date-timeonly" ? "time" : "text"); - this.input_date.addClass("et2_date").attr("type", type).attr("size", 5) + this.input_date.addClass("et2_date").attr("type", "text").attr("size", 5) .appendTo(this.span); this.setDOMNode(this.span[0]); @@ -77,6 +76,7 @@ var et2_date = et2_inputWidget.extend( } else { + this.input_date.addClass("et2_time"); this.egw().time(this.input_date); } // Update internal value when changed diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css index 46970e8146..954dc46cf9 100644 --- a/etemplate/templates/default/etemplate2.css +++ b/etemplate/templates/default/etemplate2.css @@ -353,7 +353,7 @@ span.et2_date input.et2_date { background-position: top right; background-size: contain; } -span.et2_date input[type=time].et2_date { +span.et2_date input.et2_time { min-width: 6ex; } span.et2_date span {