extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show both date and time for before today time.

Browse Source 
- Fix mails in the list not showing date and time under date column.
This commit is contained in:
Hadi Nategh 2014-10-20 13:29:29 +00:00
parent 4ae871020d
commit 570558ff31
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_widget_date.js
View File

@ -815,10 +815,11 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
{ {
display = date(this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a', this.date); display = date(this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a', this.date);
} }
// Before today - just the date // Before today - date and time
else else
{ {
display = date(this.egw().preference('dateformat'), this.date); display = date(this.egw().preference('dateformat') + " " +
(this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a'), this.date);
} }
break; break;
case "date": case "date":