Improve display of current day in month view

UI/Scheduler/UIxCalMonthView.h

@@ -1,8 +1,6 @@
 /* UIxCalMonthView.h - this file is part of SOGo
  *
- * Copyright (C) 2006-2009 Inverse inc.
+ * Copyright (C) 2006-2015 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,7 +67,6 @@
 
 - (void) setCurrentTableDay: (NSCalendarDate *) newCurrentTableDay;
 - (NSCalendarDate *) currentTableDay;
-- (NSString *) labelForCurrentDayCell;
 
 @end
 

UI/Scheduler/UIxCalMonthView.m

@@ -1,8 +1,6 @@
 /* UIxCalMonthView.m - this file is part of SOGo
  *
- * Copyright (C) 2006, 2007 Inverse inc.
+ * Copyright (C) 2006-2015 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -235,27 +233,6 @@
   return currentWeek;
 }
 
-- (NSString *) labelForCurrentDayCell
-{
-  NSCalendarDate *lastDayOfMonth;
-  NSString *label, *monthOfYear;
-  int dayOfMonth;
-
-  dayOfMonth = [currentTableDay dayOfMonth];
-  lastDayOfMonth = [currentTableDay lastDayOfMonth];
-  if (dayOfMonth == 1
-      || [currentTableDay isDateOnSameDay: lastDayOfMonth])
-    {
-      monthOfYear
-        = [monthNames objectAtIndex: [currentTableDay monthOfYear]];
-      label = [NSString stringWithFormat: @"%d %@", dayOfMonth, monthOfYear];
-    }
-  else
-    label = [NSString stringWithFormat: @"%d", dayOfMonth];
-
-  return label;
-}
-
 - (NSString *) headerDayCellClasses
 {
   unsigned int dayOfWeek;
@@ -265,24 +242,19 @@
   return [NSString stringWithFormat: @"headerDay day%d", dayOfWeek];
 }
 
-- (NSString *) dayHeaderNumber
+- (NSString *) dayHeaderMonth
 {
-  NSString *nameOfMonth, *dayHeaderNumber;
+  NSString *nameOfMonth = nil;
   unsigned int dayOfMonth;
 
   dayOfMonth = [currentTableDay dayOfMonth];
   if (dayOfMonth == 1
       || [currentTableDay isDateOnSameDay: [currentTableDay lastDayOfMonth]])
     {
-      nameOfMonth
+      nameOfMonth = [self localizedNameForMonthOfYear: [currentTableDay monthOfYear]];
-        = [self localizedNameForMonthOfYear: [currentTableDay monthOfYear]];
-      dayHeaderNumber = [NSString stringWithFormat: @"%d %@", dayOfMonth,
-                                  nameOfMonth];
     }
-  else
-    dayHeaderNumber = [NSString stringWithFormat: @"%d", dayOfMonth];
 
-  return dayHeaderNumber;
+  return nameOfMonth;
 }
 
 - (NSString *) dayCellClasses

UI/Templates/SchedulerUI/UIxCalMonthView.wox

@@ -64,17 +64,19 @@
                 var:id="currentDayId"
                 >
               <div layout="column" layout-fill="true">
+                <div class="sg-calendar-tile-header md-default-theme md-fg md-hue-2">
                 <var:if condition="currentTableDay.isToday">
-                  <div class="sg-calendar-tile-header md-default-theme md-bg md-accent md-hue-2"><var:string value="dayHeaderNumber"/></div>
+                  <span class="md-default-theme md-bg md-accent md-hue-2"><var:string value="currentTableDay.dayOfMonth"/></span> <var:string value="dayHeaderMonth"/>
                 </var:if>
                 <var:if condition="currentTableDay.isToday" const:negate="YES">
-                  <div class="sg-calendar-tile-header md-default-theme md-fg md-hue-2"><var:string value="dayHeaderNumber"/></div>
+                  <span class=""><var:string value="currentTableDay.dayOfMonth"/></span> <var:string value="dayHeaderMonth"/>
                 </var:if>
+                </div>
                 <md-content>
-                <sg-calendar-month-day
+                  <sg-calendar-month-day
-                    sg-blocks="calendar.views[0].blocks"
+                      sg-blocks="calendar.views[0].blocks"
-                    sg-click="list.openEvent(event, component)"
+                      sg-click="list.openEvent(event, component)"
-                    var:sg-day="currentTableDay.shortDateString"><!-- day's events --></sg-calendar-month-day>
+                      var:sg-day="currentTableDay.shortDateString"><!-- day's events --></sg-calendar-month-day>
                 </md-content>
               </div>
             </md-grid-tile>

UI/WebServerResources/scss/views/SchedulerUI.scss

@@ -212,17 +212,25 @@ $scrollbar_width: 16px;
       &.dayOfAnotherMonth {
         background-color: rgb(250, 250, 250);
         //border-color: #ddd;
-        .sg-calendar-tile-header {
+        .sg-calendar-tile-header,
+        .sg-calendar-tile-header > span {
           color: rgb(221, 221, 221) !important; // Overwrite dynamic CSS theme
         }
       }
       &.dayOfToday {
         .sg-calendar-tile-header {
-          border-radius: 50%;
+          > span {
-          color: #fff;
+            border-radius: 50%;
-          display: inline;
+            color: #fff;
-          font-weight: 600;
+            display: inline-block;
-          margin-right: auto;
+            font-weight: 600;
+            margin-right: auto;
+            margin-left: 1px;
+            min-width: $sg-font-size-2 + 4px;
+            min-height: $sg-font-size-2 + 4px;
+            line-height: $sg-font-size-2 + 4px;
+            text-align: center;
+          }
         }
       }
     }