(html) Display year in day and week views

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)

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]];

UI/Templates/SchedulerUI/UIxCalDayTable.wox

@@ -28,7 +28,10 @@
               <var:if condition="currentTableDay.isToday" const:negate="YES">
                 <div class="sg-md-display-2--thin md-default-theme md-fg md-hue-2"><var:string value="currentTableDay.dayOfMonth"/></div>
               </var:if>
-              <div class="md-default-theme md-fg md-primary md-hue-2"><var:string value="labelForMonth"/></div>
+              <div class="md-default-theme md-fg md-primary md-hue-2">
+                <var:string value="labelForMonth"/>
+                <span class="md-default-theme md-fg md-primary md-hue-1"><var:string value="currentYear"/></span>
+              </div>
             </var:if>
 
             <!-- Day view header -->
@@ -39,7 +42,10 @@
               <var:if condition="currentTableDay.isToday" const:negate="YES">
                 <div class="sg-md-display-4 md-default-theme md-fg md-hue-2"><var:string value="currentTableDay.dayOfMonth"/></div>
               </var:if>
-              <div class="md-default-theme md-fg md-primary md-hue-2"><var:string value="labelForMonth"/></div>
+              <div class="md-default-theme md-fg md-primary md-hue-2">
+                <var:string value="labelForMonth"/><br/>
+                <span class="md-default-theme md-fg md-primary md-hue-1"><var:string value="currentTableDay.yearOfCommonEra"/></span>
+              </div>
             </var:if>
           </div>
         </var:foreach>