Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 9cd8783

Browse files
authored
Merge pull request #417 from BrentWMiller/Message-log-updates
Message log updates
2 parents 5ecfe0e + 766a3d0 commit 9cd8783

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

source/components/messageLog/messageLog.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<rlBusy [loading]="loading" size="2x"></rlBusy>
2-
<div class="content-group"
2+
<div class="rl-messages"
33
*ngFor="let entry of messages"
4-
[class.system-note]="entry.isSystemNote">
4+
[class.rl-message-system]="entry.isSystemNote">
55
<span *ngIf="template">
66
<template [ngTemplateOutlet]="newTemplate()" [ngOutletContext]="{ $implicit: entry }"></template>
77
</span>

source/components/messageLog/ng1/messageLog.html

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,22 @@
77

88
<div>
99
<rl-busy loading="log.loadingInitial" size="2x"></rl-busy>
10-
<div class="content-group" ng-repeat="entry in log.messages" rl-alias="entry as {{log.messageAs}}" ng-class="{ 'system-note': entry.isSystemNote }">
10+
<div ng-repeat="entry in log.messages" rl-alias="entry as {{log.messageAs}}" ng-class="{ 'rl-message-system': entry.isSystemNote }">
1111
<rl-generic-container selector="log.getEntrySelector(entry)" templates="log.templates">
1212
<template default>
13-
<div class="message-body">
14-
<div class="message-content">
15-
<div ng-bind-html="entry.message"></div>
13+
<div class="rl-message">
14+
<div class="rl-message-content">
15+
<div class="rl-message-description" ng-bind-html="entry.message"></div>
16+
<div class="rl-message-byline">
17+
{{entry.createdBy.name}}<br>
18+
{{ entry.createdDate | rlDate:true }}
19+
<span ng-if="entry.edited" class="edited-note" rl-popover="log.tooltipTemplate" popover-trigger="mouseenter">(edited)</span>
20+
</div>
21+
</div>
22+
<div class="rl-message-buttons">
23+
<rl-button-async class="rl-message-button" type="danger flat" action="log.messageLog.deleteMessage(entry)" ng-if="log.canDeleteEntry(entry)"><i class="fa fa-remove"></i></rl-button-async>
24+
<rl-button-async class="rl-message-button" type="default flat" action="log.editMessage(entry)" ng-if="log.canEditEntry(entry)"><i class="fa fa-edit"></i></rl-button-async>
1625
</div>
17-
<span class="message-button" ng-if="log.canEditEntry(entry)">
18-
<rl-button-async type="message-default flat" action="log.editMessage(entry)" size="xs"><i class="fa fa-edit"></i></rl-button-async>
19-
</span>
20-
<span class="message-button" ng-if="log.canDeleteEntry(entry)">
21-
<rl-button-async type="message-danger flat" action="log.messageLog.deleteMessage(entry)" size="xs"><i class="fa fa-remove"></i></rl-button-async>
22-
</span>
23-
</div>
24-
<div class="message-byline">
25-
<div class="byline">{{entry.createdBy.name}}</div>
26-
<div class="byline">
27-
{{ entry.createdDate | rlDate:true }}
28-
<span ng-if="entry.edited" class="edited-note" rl-popover="log.tooltipTemplate" popover-trigger="mouseenter">(edited)</span></div>
2926
</div>
3027
</template>
3128
</rl-generic-container>

0 commit comments

Comments
 (0)