From ace9fa9e4e4ce59ad770720f8905edb087a968d4 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 13 Nov 2015 15:45:44 -0500
Subject: [PATCH] (html) Show event location in Calendar days views

---
 .../Scheduler/sgCalendarDayBlock.directive.js |  1 +
 .../sgCalendarMonthEvent.directive.js         |  2 +-
 .../scss/views/SchedulerUI.scss               | 24 ++++++++-----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
index 1a4cf0bab..2702d4757 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
@@ -44,6 +44,7 @@
         //       Component is private
         '        <md-icon ng-if="block.component.c_classification == 2" class="material-icons icon-vpn-key"></md-icon>',
         '      </span>',
+        '      <div class="secondary" ng-if="block.component.c_location"><md-icon>place</md-icon> {{block.component.c_location}}</div>',
         '    </div>',
         '  </div>',
         '</div>'
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
index 8a23fc75b..5619c0d6e 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
@@ -25,7 +25,7 @@
       replace: true,
       template: [
         '<div class="sg-event sg-draggable" ng-click="clickBlock({clickEvent: $event, clickComponent: block.component})">',
-        '  <span ng-if="!block.component.c_isallday">{{ block.starthour }} - </span>',
+        '  <span class="secondary" ng-if="!block.component.c_isallday">{{ block.starthour }} - </span>',
         '  {{ block.component.summary }}',
         '  <span class="icons">',
         //   Component is reccurent
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index aa57830dc..98492231c 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -200,24 +200,15 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js
     position: relative;
   }
 
-  // The outer event container
-  .sg-event {
-    font-size: $sg-font-size-2;
-    &, md-icon {
-      //color: #fff !important; // Overwrite dynamic CSS theme
-    }
-    .material-icons {
-      font-size: $sg-font-size-2;
-    }
-  }
-
   // Events from editable calendars are draggable
   .sg-draggable-calendar-block,
   .sg-event--ghost {
     cursor: move;
   }
 
+  // The outer event container
   .sg-event {
+    font-size: $sg-font-size-2;
     border-radius: 3px;
     position: absolute;
     left: 0;
@@ -255,6 +246,14 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js
       overflow: hidden;
     }
 
+    .material-icons {
+     font-size: $sg-font-size-2;
+    }
+
+    .secondary { // location in days view, hours in month view
+      font-weight: $sg-font-light;
+    }
+
     // Event DnD drag grips
 
     &:hover {
@@ -413,9 +412,6 @@ $block_margin: 2%; // See sgCalendarDayBlock.directive.js
       margin: $block_margin;
       text-overflow: ellipsis;
       white-space: nowrap;
-      span { // hours
-        font-weight: $sg-font-light;
-      }
     }
   }