extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a new date sub-widget, date-time_today that displays the time if value is today, the date if the value is not today

Browse Source
This commit is contained in:
Nathan Gray 2013-02-08 11:10:45 +00:00
parent a48c990607
commit b42e913478
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etemplate/js/et2_widget_date.js
View File

@ -533,7 +533,7 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM], {
this._super.apply(this, arguments);
this.value = "";
this.span = $j(document.createElement(this._type == "date-since" ? "span" : "time"))
this.span = $j(document.createElement(this._type == "date-since" || this._type == "date-time_today" ? "span" : "time"))
.addClass("et2_date_ro et2_label");
this.setDOMNode(this.span[0]);
@ -566,6 +566,18 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM], {
var display = this.date.toString();
switch(this._type) {
case "date-time_today":
// Today - just the time
if(this.date.toDateString() == new Date().toDateString())
{
display = date(this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a', this.date);
}
// Before today - just the date
else
{
display = date(this.egw().preference('dateformat'), this.date);
}
break;
case "date":
display = date(this.egw().preference('dateformat'), this.date);
break;
@ -651,7 +663,7 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM], {
});
et2_register_widget(et2_date_ro, ["date_ro", "date-time_ro", "date-since"]);
et2_register_widget(et2_date_ro, ["date_ro", "date-time_ro", "date-since", "date-time_today"]);
var et2_date_timeonly_ro = et2_date_ro.extend({