Skip to content

Commit f5aeedb

Browse files
andrenarchyandrenarchy
committed
margin-{cluster,discussion,reply}: properly render deleted discussions/replies
1 parent 0507086 commit f5aeedb

File tree

3 files changed

+86
-71
lines changed

3 files changed

+86
-71
lines changed

‎app/components/margin-cluster.html‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,28 @@
3434
<div ng-if="$ctrl.cluster.discussions.length > 2" class="ph-component-shadow-2"></div>
3535
<div ng-if="$ctrl.cluster.discussions.length > 1" class="ph-component-shadow-1"></div>
3636
<div class="ph-margin-row-content">
37-
<p class="ph-xs-margin-bottom ph-margin-info">
38-
<a href="./users/{{$ctrl.cluster.discussions[0].author.account.username}}">
39-
{{$ctrl.cluster.discussions[0].author.displayName}}</a>
40-
· <span am-time-ago="$ctrl.cluster.discussions[0].createdAt"></span>
41-
</p>
42-
<div class="ph-component-body-container">
43-
<div ng-if="!$ctrl.cluster.discussions[0].body" class="ph-component-discussion-title ph-xs-margin-bottom">
44-
<mathjax body="$ctrl.cluster.discussions[0].title"></mathjax>
45-
</div>
46-
<div ng-if="$ctrl.cluster.discussions[0].body">
47-
<p class="ph-margin-title ph-component-discussion-title ph-no-margin ph-xs-margin-bottom">
37+
<p ng-if="$ctrl.cluster.discussions[0].deleted" class="ph-margin-info">
38+
<em>Contribution has been deleted. Reason: {{$ctrl.cluster.discussions[0].deletedReason}}.</em>
39+
</p>
40+
<div ng-if="!$ctrl.cluster.discussions[0].deleted">
41+
<p class="ph-xs-margin-bottom ph-margin-info">
42+
<a href="./users/{{$ctrl.cluster.discussions[0].author.account.username}}">
43+
{{$ctrl.cluster.discussions[0].author.displayName}}</a>
44+
· <span am-time-ago="$ctrl.cluster.discussions[0].createdAt"></span>
45+
</p>
46+
<div class="ph-component-body-container">
47+
<div ng-if="!$ctrl.cluster.discussions[0].body" class="ph-component-discussion-title ph-xs-margin-bottom">
4848
<mathjax body="$ctrl.cluster.discussions[0].title"></mathjax>
49-
</p>
50-
<kramjax
51-
body="$ctrl.cluster.discussions[0].body"
52-
class="ph-component-discussion-body"
53-
></kramjax>
49+
</div>
50+
<div ng-if="$ctrl.cluster.discussions[0].body">
51+
<p class="ph-margin-title ph-component-discussion-title ph-no-margin ph-xs-margin-bottom">
52+
<mathjax body="$ctrl.cluster.discussions[0].title"></mathjax>
53+
</p>
54+
<kramjax
55+
body="$ctrl.cluster.discussions[0].body"
56+
class="ph-component-discussion-body"
57+
></kramjax>
58+
</div>
5459
</div>
5560
</div>
5661
<div class="clearfix">

‎app/components/margin-discussion.html‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,25 @@
3232
<div class="ph-margin-row-content">
3333
<!-- view original comment -->
3434
<div ng-if="!$ctrl.editing" class="clearfix">
35-
<p class="ph-xs-margin-bottom ph-margin-info">
36-
<a href="./users/{{$ctrl.discussion.author.account.username}}">
37-
{{$ctrl.discussion.author.displayName}}</a>
38-
· <span am-time-ago="$ctrl.discussion.createdAt"></span>
35+
<p ng-if="$ctrl.discussion.deleted" class="ph-margin-info">
36+
<em>Contribution has been deleted. Reason: {{$ctrl.discussion.deletedReason}}.</em>
3937
</p>
40-
<div class="ph-margin-body ph-xs-margin-bottom">
41-
<div ng-if="!$ctrl.discussion.body">
42-
<mathjax body="$ctrl.discussion.title"></mathjax>
43-
</div>
44-
<div ng-if="$ctrl.discussion.body">
45-
<p class="ph-margin-title ph-no-margin ph-xs-margin-bottom">
38+
<div ng-if="!$ctrl.discussion.deleted">
39+
<p class="ph-xs-margin-bottom ph-margin-info">
40+
<a href="./users/{{$ctrl.discussion.author.account.username}}">
41+
{{$ctrl.discussion.author.displayName}}</a>
42+
· <span am-time-ago="$ctrl.discussion.createdAt"></span>
43+
</p>
44+
<div class="ph-margin-body ph-xs-margin-bottom">
45+
<div ng-if="!$ctrl.discussion.body">
4646
<mathjax body="$ctrl.discussion.title"></mathjax>
47-
</p>
48-
<kramjax body="$ctrl.discussion.body"></kramjax>
47+
</div>
48+
<div ng-if="$ctrl.discussion.body">
49+
<p class="ph-margin-title ph-no-margin ph-xs-margin-bottom">
50+
<mathjax body="$ctrl.discussion.title"></mathjax>
51+
</p>
52+
<kramjax body="$ctrl.discussion.body"></kramjax>
53+
</div>
4954
</div>
5055
</div>
5156
<div class="pull-right">
@@ -58,7 +63,7 @@
5863
>
5964
<discussion-share-icon discussion="$ctrl.discussion"></discussion-share-icon>
6065
</div>
61-
<div class="btn-group" uib-dropdown>
66+
<div ng-if="!$ctrl.discussion.deleted" class="btn-group" uib-dropdown>
6267
<button class="btn btn-link btn-xs"
6368
uib-dropdown-toggle
6469
uib-tooltip="Options"

‎app/components/margin-reply.html‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,53 @@
1212
<div class="ph-margin-row-content">
1313
<!-- view reply -->
1414
<div ng-if="!$ctrl.editing" class="clearfix">
15-
<div class="ph-margin-info">
16-
<p class="ph-xs-margin-bottom">
17-
<a href="./users/{{$ctrl.reply.author.account.username}}">
18-
{{$ctrl.reply.author.displayName}}</a>
19-
· <span am-time-ago="$ctrl.reply.createdAt"></span>
20-
</p>
21-
</div>
22-
<kramjax body="$ctrl.reply.body"></kramjax>
23-
<div class="pull-right">
24-
<div class="btn-group" uib-dropdown>
25-
<button class="btn btn-link btn-xs"
26-
uib-dropdown-toggle
27-
uib-tooltip="Options"
28-
tooltip-class="tooltip-nowrap"
29-
>
30-
<i class="fa fa-fw fa-lg fa-ellipsis-v"></i>
31-
</button>
32-
<ul class="dropdown-menu dropdown-menu-right ph-margin-dropdown">
33-
<li>
34-
<a ng-href=".{{'documentItem.discussion.thread' | routeSegmentUrl:{discussion: $ctrl.reply.discussion} }}#{{$ctrl.reply.id}}">
35-
<i class="fa fa-fw fa-comments"></i> Show discussion view
36-
</a>
37-
</li>
38-
<!-- edit reply -->
39-
<li ng-if="$ctrl.authService.user.id === $ctrl.reply.author.id"
40-
ng-class="{disabled: $ctrl.submitting}">
41-
<a ng-click="$ctrl.editing = true" href>
42-
<i class="fa fa-fw fa-pencil"></i> Edit
43-
</a>
44-
</li>
45-
<!-- delete reply -->
46-
<li ng-if="$ctrl.authService.user.id === $ctrl.reply.author.id"
47-
ng-class="{disabled: $ctrl.submitting}">
48-
<a ng-confirm-click="Really delete reply?"
49-
confirmed-click="$ctrl.delete(reply)" href>
50-
<i class="fa fa-fw fa-times"></i> Delete
51-
</a>
52-
</li>
53-
<!--li ng-if="$ctrl.authService.user.id !== $ctrl.reply.author.id">
54-
<a href><i class="fa fa-fw fa-flag"></i> Flag</a>
55-
</li-->
56-
</ul>
15+
<p ng-if="$ctrl.reply.deleted" class="ph-margin-info">
16+
<em>Contribution has been deleted. Reason: {{$ctrl.reply.deletedReason}}.</em>
17+
</p>
18+
<div ng-if="!$ctrl.reply.deleted">
19+
<div class="ph-margin-info">
20+
<p class="ph-xs-margin-bottom">
21+
<a href="./users/{{$ctrl.reply.author.account.username}}">
22+
{{$ctrl.reply.author.displayName}}</a>
23+
· <span am-time-ago="$ctrl.reply.createdAt"></span>
24+
</p>
25+
</div>
26+
<kramjax body="$ctrl.reply.body"></kramjax>
27+
<div class="pull-right">
28+
<div class="btn-group" uib-dropdown>
29+
<button class="btn btn-link btn-xs"
30+
uib-dropdown-toggle
31+
uib-tooltip="Options"
32+
tooltip-class="tooltip-nowrap"
33+
>
34+
<i class="fa fa-fw fa-lg fa-ellipsis-v"></i>
35+
</button>
36+
<ul class="dropdown-menu dropdown-menu-right ph-margin-dropdown">
37+
<li>
38+
<a ng-href=".{{'documentItem.discussion.thread' | routeSegmentUrl:{discussion: $ctrl.reply.discussion} }}#{{$ctrl.reply.id}}">
39+
<i class="fa fa-fw fa-comments"></i> Show discussion view
40+
</a>
41+
</li>
42+
<!-- edit reply -->
43+
<li ng-if="$ctrl.authService.user.id === $ctrl.reply.author.id"
44+
ng-class="{disabled: $ctrl.submitting}">
45+
<a ng-click="$ctrl.editing = true" href>
46+
<i class="fa fa-fw fa-pencil"></i> Edit
47+
</a>
48+
</li>
49+
<!-- delete reply -->
50+
<li ng-if="$ctrl.authService.user.id === $ctrl.reply.author.id"
51+
ng-class="{disabled: $ctrl.submitting}">
52+
<a ng-confirm-click="Really delete reply?"
53+
confirmed-click="$ctrl.delete(reply)" href>
54+
<i class="fa fa-fw fa-times"></i> Delete
55+
</a>
56+
</li>
57+
<!--li ng-if="$ctrl.authService.user.id !== $ctrl.reply.author.id">
58+
<a href><i class="fa fa-fw fa-flag"></i> Flag</a>
59+
</li-->
60+
</ul>
61+
</div>
5762
</div>
5863
</div>
5964
</div>

0 commit comments

Comments
 (0)