(html) Show event location in Calendar days views

pull/101/head^2
Francis Lachapelle 2015-11-13 15:45:44 -05:00
parent 58dfa2e43b
commit ace9fa9e4e
3 changed files with 12 additions and 15 deletions

View File

@ -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>'

View File

@ -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

View File

@ -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;
}
}
}