(js) Show calendar names in events blocks

Fixes #4713
pull/251/head
Francis Lachapelle 2019-03-27 09:48:00 -04:00
parent f972684869
commit 42dd956b9f
3 changed files with 8 additions and 2 deletions

View File

@ -14,7 +14,7 @@
</md-button>
</div>
<div layout="column" class="md-flex">
<div layout="column" class="md-flex allDaysView--container">
<!-- Display today abreviation and date -->
<div class="days dayLabels">
<var:foreach list="daysToDisplay" item="currentTableDay">

View File

@ -50,7 +50,7 @@
' <span ng-show="'+p+'block.component.c_priority" class="sg-priority">{{'+p+'block.component.c_priority}}</span>',
// Summary
' {{ '+p+'block.component.summary }}',
' <div class="secondary md-truncate" ng-show="'+p+'showCalendarName" ng-bind="'+p+'block.component.calendarName"></div>',
// Icons
' <span class="icons">',
// Component is reccurent
' <md-icon ng-if="'+p+'block.component.occurrenceId" class="material-icons icon-repeat"></md-icon>',
@ -65,6 +65,9 @@
' <div class="secondary" ng-if="'+p+'block.component.c_location">',
' <md-icon>place</md-icon> <span ng-bind="'+p+'block.component.c_location"></span>',
' </div>',
// Calendar name
' <div class="secondary md-truncate" ng-if="'+p+'showCalendarName"',
' ng-bind="'+p+'block.component.calendarName"></div>',
' </div>',
' </div>',
' <div class="ghostStartHour" ng-if="block.startHour">{{ block.startHour }}</div>',

View File

@ -122,6 +122,9 @@ $quarter_height: 10px;
}
// The all-day events appear in the shrinkable toolbar, bellow the days labels
.allDaysView--container {
overflow: hidden;
}
.allDaysView {
border-bottom: 1px solid sg-color($sogoPaper, 300);
max-height: $sg-font-size-4 * 6;