diff --git a/NEWS b/NEWS index 35094b971..578dbf1db 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ New features Enhancements - [web] constrain event/task reminder to a positive number + - [web] display year in day and week views Bug fixes - [core] handle broken CalDAV clients sending bogus SENT-BY (#3992) diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m index 8cd7629ec..2a74987f5 100644 --- a/UI/Scheduler/UIxCalDayTable.m +++ b/UI/Scheduler/UIxCalDayTable.m @@ -305,6 +305,15 @@ return [NSNumber numberWithInt: [currentTableHour intValue]]; } +- (NSString *) currentYear +{ + if (([currentTableDay dayOfMonth] == 1 && [currentTableDay monthOfYear] == 1) || + [daysToDisplay indexOfObject: currentTableDay] == 0) + return [NSString stringWithFormat: @"%i", [currentTableDay yearOfCommonEra]]; + + return nil; +} + - (NSString *) labelForDay { return [weekDays objectAtIndex: [currentTableDay dayOfWeek]]; diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox index 733a9eaa5..b2e785da2 100644 --- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox +++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox @@ -28,7 +28,10 @@
-
+
+ + +
@@ -39,7 +42,10 @@
-
+
+
+ +