Add comments to customer calendar

merge-requests/23/head
Mike Koch 8 years ago
parent da0fe09fc7
commit eeaf56d3b7

@ -107,19 +107,23 @@ require_once(HESK_PATH . 'inc/header.inc.php');
<div class="popover-template" style="display: none">
<div>
<div class="popover-location">
<strong>Location</strong>
<strong><?php echo $hesklang['event_location']; ?></strong>
<span></span>
</div>
<div class="popover-category">
<strong>Category</strong>
<strong><?php echo $hesklang['category']; ?></strong>
<span></span>
</div>
<div class="popover-from">
<strong>From</strong>
<strong><?php echo $hesklang['from']; ?></strong>
<span></span>
</div>
<div class="popover-to">
<strong>To</strong>
<strong><?php echo $hesklang['to_title_case']; ?></strong>
<span></span>
</div>
<div class="popover-comments">
<strong><?php echo $hesklang['event_comments']; ?></strong>
<span></span>
</div>
</div>

@ -52,7 +52,8 @@ $(document).ready(function() {
$contents.find('.popover-category span').text(event.categoryName).end()
.find('.popover-location span').text(event.location).end()
.find('.popover-from span').text(event.start.format(format)).end()
.find('.popover-to span').text(endDate.format(format));
.find('.popover-to span').text(endDate.format(format)).end()
.find('.popover-comments span').text(event.comments);
var $eventMarkup = $(this);
$eventMarkup.popover({
title: event.title,
@ -88,7 +89,7 @@ function buildEvent(id, dbObject) {
type: dbObject.type,
categoryId: dbObject.categoryId,
className: 'category-' + dbObject.categoryId,
textColor: calculateTextColor(dbObject.categoryColor)
textColor: calculateTextColor(dbObject.categoryColor),
};
}

Loading…
Cancel
Save