From e185d8fe0234726c38d1d2e1808472ebc389ddc6 Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Thu, 14 May 2015 20:51:41 -0700
Subject: [PATCH] Event lists in days of month view should also specify the
 time of the event.

Summary: Ref T8188, Event lists in days of month view should also specify the time of the event.

Test Plan: Time start should be display on event links in month view. Note: not handling the case where an event starts on a previous day - always displaying just start time, with no disgression.

Reviewers: chad, #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T8188

Differential Revision: https://secure.phabricator.com/D12852
---
 resources/celerity/map.php                    |  8 +++---
 .../css/phui/calendar/phui-calendar-list.css  |  1 +
 .../css/phui/calendar/phui-calendar-month.css | 28 +++++++++++++++----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 4572955492..cf96220e2e 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -121,8 +121,8 @@ return array(
     'rsrc/css/layout/phabricator-side-menu-view.css' => 'c1db9e9c',
     'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '3b4a65d8',
-    'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1d0ca59',
-    'rsrc/css/phui/calendar/phui-calendar-month.css' => '3e42c803',
+    'rsrc/css/phui/calendar/phui-calendar-list.css' => '840baa8d',
+    'rsrc/css/phui/calendar/phui-calendar-month.css' => '450c37ea',
     'rsrc/css/phui/calendar/phui-calendar.css' => '8345be98',
     'rsrc/css/phui/phui-action-header-view.css' => '89c497e7',
     'rsrc/css/phui/phui-action-list.css' => '4f4d09f2',
@@ -762,8 +762,8 @@ return array(
     'phui-button-css' => 'de610129',
     'phui-calendar-css' => '8345be98',
     'phui-calendar-day-css' => '3b4a65d8',
-    'phui-calendar-list-css' => 'c1d0ca59',
-    'phui-calendar-month-css' => '3e42c803',
+    'phui-calendar-list-css' => '840baa8d',
+    'phui-calendar-month-css' => '450c37ea',
     'phui-crumbs-view-css' => '594d719e',
     'phui-document-view-css' => '94d5dcd8',
     'phui-feed-story-css' => 'c9f3a0b5',
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
index bf92ee4b09..db69c78d03 100644
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-list.css
@@ -52,6 +52,7 @@
 
 .phui-calendar-list-item .phui-calendar-list-time {
   position: absolute;
+  top: 0;
   width: 60px;
   right: 0;
   top: 0;
diff --git a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
index 9fc1e8c52d..2e9f30a4c1 100644
--- a/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
+++ b/webroot/rsrc/css/phui/calendar/phui-calendar-month.css
@@ -139,9 +139,6 @@ li.phui-calendar-list-item.all-day:first-child {
 
 .phui-calendar-view .phui-calendar-list li {
   margin: 0 8px;
-  display: inline-block;
-  float: left;
-  clear: both;
 }
 
 .phui-calendar-view .phui-calendar-list li:first-child {
@@ -160,11 +157,18 @@ li.phui-calendar-list-item.all-day:first-child {
 
 .phui-calendar-view .phui-calendar-list-title {
   width: auto;
-  margin-left: 10px;
   white-space: normal;
   word-break: break-word;
 }
 
+li.phui-calendar-list-item .phui-calendar-list-title a {
+  text-align: left;
+  padding-left: 8px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 li.phui-calendar-list-item.all-day .phui-calendar-list-title a{
   color: {$greytext};
 }
@@ -173,6 +177,18 @@ li.phui-calendar-viewer-invited.all-day .phui-calendar-list-title a{
   color: {$green};
 }
 
-.phui-calendar-view .phui-calendar-list-time {
-  display: none;
+.phui-calendar-view li.phui-calendar-list-item .phui-calendar-list-time {
+  position: absolute;
+  width: 60px;
+  right: 0;
+  top: 1px;
+  color: {$lightgreytext};
+  text-align: right;
+}
+
+.phui-calendar-view
+li.phui-calendar-list-item.all-day
+.phui-calendar-list-time  {
+  top: 4px;
+  right: 8px;
 }