Highlighting the current day in calendar.

afaquejam · epriestley · commit 977ac2a8fe15 · 2013-04-29T12:15:38.000-07:00
Summary: Highlights the current day :) I am not great in choosing colors. @chad can suggest some improvements :) Test Plan: {F41738} Reviewers: epriestley Reviewed By: epriestley CC: chad, aran, Korvin, AnhNhan Maniphest Tasks: T2627 Differential Revision: https://secure.phabricator.com/D5790
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
@@ -741,7 +741,7 @@
   ),
   'aphront-calendar-view-css' =>
   array(
-    'uri' => '/res/73061a31/rsrc/css/aphront/calendar-view.css',
+    'uri' => '/res/ae6f5b54/rsrc/css/aphront/calendar-view.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
@@ -11,6 +11,8 @@ public function processRequest() {
     $year    = $request->getInt('year', $year_d);
     $month_d = phabricator_format_local_time($now, $user, 'm');
     $month   = $request->getInt('month', $month_d);
+    $day   = phabricator_format_local_time($now, $user, 'j');
+
 
     $holidays = id(new PhabricatorCalendarHoliday())->loadAllWhere(
       'day BETWEEN %s AND %s',
@@ -23,7 +25,12 @@ public function processRequest() {
         strtotime("{$year}-{$month}-01"),
         strtotime("{$year}-{$month}-01 next month"));
 
-    $month_view = new AphrontCalendarMonthView($month, $year);
+    if ($month == $month_d && $year == $year_d) {
+      $month_view = new AphrontCalendarMonthView($month, $year, $day);
+    } else {
+      $month_view = new AphrontCalendarMonthView($month, $year);
+    }
+
     $month_view->setBrowseURI($request->getRequestURI());
     $month_view->setUser($user);
     $month_view->setHolidays($holidays);
diff --git a/src/applications/calendar/view/AphrontCalendarMonthView.php b/src/applications/calendar/view/AphrontCalendarMonthView.php
@@ -2,6 +2,7 @@
 
 final class AphrontCalendarMonthView extends AphrontView {
 
+  private $day;
   private $month;
   private $year;
   private $holidays = array();
@@ -27,7 +28,8 @@ public function setHolidays(array $holidays) {
     return $this;
   }
 
-  public function __construct($month, $year) {
+  public function __construct($month, $year, $day = null) {
+    $this->day = $day;
     $this->month = $month;
     $this->year = $year;
   }
@@ -65,6 +67,11 @@ public function render() {
       $holiday = idx($this->holidays, $day->format('Y-m-d'));
       $class = 'aphront-calendar-day';
       $weekday = $day->format('w');
+
+      if ($day_number == $this->day) {
+        $class .= ' aphront-calendar-today';
+      }
+
       if ($holiday || $weekday == 0 || $weekday == 6) {
         $class .= ' aphront-calendar-not-work-day';
       }
diff --git a/webroot/rsrc/css/aphront/calendar-view.css b/webroot/rsrc/css/aphront/calendar-view.css
@@ -75,6 +75,10 @@ table.aphront-calendar-view td div.aphront-calendar-day {
   background-color: #fdfae7;
 }
 
+.aphront-calendar-today {
+  background-color: #A6FAAD;
+}
+
 .aphront-calendar-empty {
   background-color: #ededed;
 }

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ table.aphront-calendar-view td div.aphront-calendar-day {`
`75`	`75`	`background-color: #fdfae7;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+.aphront-calendar-today {`
	`79`	`+ background-color: #A6FAAD;`
	`80`	`+}`
	`81`	`+`
`78`	`82`	`.aphront-calendar-empty {`
`79`	`83`	`background-color: #ededed;`
`80`	`84`	`}`