diff --git a/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs index 798e711..b5f2d60 100644 --- a/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs +++ b/assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs @@ -10,8 +10,8 @@ {{/if}} - - + + {{~raw "topic-status" topic=topic}} {{~#if isPrivateMessage}} {{~d-icon "envelope" class="private-message-icon"}} @@ -48,8 +48,10 @@ {{raw "list/activity-column" topic=topic class="num" tagName="td"}} - {{assign-actions-dropdown topic=topic - user=username - unassign=unassign - reassign=reassign}} + {{assign-actions-dropdown + topic=topic + user=username + unassign=unassign + reassign=reassign + }} diff --git a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs index 26dcd79..ee1acdc 100644 --- a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs @@ -11,26 +11,29 @@ ascending=ascending sortable=sortable listTitle=listTitle - bulkSelectEnabled=bulkSelectEnabled}} + bulkSelectEnabled=bulkSelectEnabled + }} {{/unless}} {{#each filteredTopics as |topic|}} - {{assigned-topic-list-item topic=topic - bulkSelectEnabled=bulkSelectEnabled - showTopicPostBadges=showTopicPostBadges - hideCategory=hideCategory - showPosters=showPosters - showLikes=showLikes - showOpLikes=showOpLikes - expandGloballyPinned=expandGloballyPinned - expandAllPinned=expandAllPinned - lastVisitedTopic=lastVisitedTopic - selected=selected - tagsForUser=tagsForUser - unassign=unassign - reassign=reassign}} + {{assigned-topic-list-item + topic=topic + bulkSelectEnabled=bulkSelectEnabled + showTopicPostBadges=showTopicPostBadges + hideCategory=hideCategory + showPosters=showPosters + showLikes=showLikes + showOpLikes=showOpLikes + expandGloballyPinned=expandGloballyPinned + expandAllPinned=expandAllPinned + lastVisitedTopic=lastVisitedTopic + selected=selected + tagsForUser=tagsForUser + unassign=unassign + reassign=reassign + }} {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}} {{/each}} diff --git a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs index 8013463..db94795 100644 --- a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs @@ -1,30 +1,30 @@ {{#conditional-loading-spinner condition=loading}} {{#if hasIncoming}} {{/if}} {{#if topics}} - {{assigned-topic-list showPosters=showPosters - hideCategory=hideCategory - topics=topics - expandExcerpts=expandExcerpts - bulkSelectEnabled=bulkSelectEnabled - canBulkSelect=canBulkSelect - selected=selected - skipHeader=skipHeader - tagsForUser=tagsForUser - changeSort=changeSort - toggleBulkSelect=toggleBulkSelect - unassign=unassign - reassign=reassign - onScroll=onScroll - scrollOnLoad=scrollOnLoad}} + {{assigned-topic-list + showPosters=showPosters + hideCategory=hideCategory + topics=topics + expandExcerpts=expandExcerpts + bulkSelectEnabled=bulkSelectEnabled + canBulkSelect=canBulkSelect + selected=selected + skipHeader=skipHeader + tagsForUser=tagsForUser + changeSort=changeSort + toggleBulkSelect=toggleBulkSelect + unassign=unassign + reassign=reassign + onScroll=onScroll + scrollOnLoad=scrollOnLoad + }} {{else}} {{#unless loadingMore}}
diff --git a/assets/javascripts/discourse/templates/components/claim-topic.hbs b/assets/javascripts/discourse/templates/components/claim-topic.hbs index 6d13469..4ea83f2 100644 --- a/assets/javascripts/discourse/templates/components/claim-topic.hbs +++ b/assets/javascripts/discourse/templates/components/claim-topic.hbs @@ -5,13 +5,16 @@ class="btn-small unassign" action=(action "unassign") disabled=unassigning - title="discourse_assign.unassign.help"}} + title="discourse_assign.unassign.help" + }} {{/assigned-to}} {{else}} - {{d-button class="btn-small assign" + {{d-button + class="btn-small assign" icon="user-plus" action=(action "claim") disabled=claiming label="discourse_assign.claim.title" - title="discourse_assign.claim.help"}} + title="discourse_assign.claim.help" + }} {{/if}} diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-topics-list.hbs index 2f28405..0b7602b 100644 --- a/assets/javascripts/discourse/templates/group-topics-list.hbs +++ b/assets/javascripts/discourse/templates/group-topics-list.hbs @@ -1,11 +1,12 @@
{{input - class="no-blur" - value=searchTerm - placeholder=(i18n "discourse_assign.topic_search_placeholder") - input=(action "onChangeFilter" value="target.value") - autocomplete="discourse"}} + class="no-blur" + value=searchTerm + placeholder=(i18n "discourse_assign.topic_search_placeholder") + input=(action "onChangeFilter" value="target.value") + autocomplete="discourse" + }}
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}} diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs index 7536ed4..1ab424b 100644 --- a/assets/javascripts/discourse/templates/group/assigned.hbs +++ b/assets/javascripts/discourse/templates/group/assigned.hbs @@ -19,7 +19,8 @@ assignmentCount=group.assignment_count search=search ascending=ascending - order=order}} + order=order + }} {{#each members as |member|}} {{group-assigned-filter show-avatar=true @@ -27,7 +28,8 @@ routeType=route_type search=search ascending=ascending - order=order}} + order=order + }} {{/each}} {{conditional-loading-spinner condition=loading}} {{/load-more}} diff --git a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs index 201849a..684e5d4 100644 --- a/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs +++ b/assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs @@ -12,7 +12,7 @@
{{html-safe topic.excerpt}} {{#if topic.excerptTruncated}} - {{#unless topic.canClearPin}}{{i18n "read_more"}}{{/unless}} + {{#unless topic.canClearPin}}{{i18n "read_more"}}{{/unless}} {{/if}} {{#if topic.canClearPin}} {{i18n "topic.clear_pin.title"}} @@ -33,7 +33,7 @@ {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
{{raw "list/activity-column" topic=topic tagName="div" class="num activity last"}} - {{topic.last_poster_username}} + {{topic.last_poster_username}}
{{#unless hideCategory}}
diff --git a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs index 7337aff..4ee9862 100644 --- a/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs @@ -1,9 +1,9 @@ {{#conditional-loading-spinner condition=loading}} {{#if hasIncoming}} {{/if}} diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs index 98f54e5..c2afaa8 100644 --- a/assets/javascripts/discourse/templates/modal/assign-user.hbs +++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs @@ -15,7 +15,7 @@ }}
{{#each assignSuggestions as |user|}} - + {{avatar user imageSize="small"}} {{/each}} diff --git a/assets/javascripts/discourse/templates/user-assigned-topics.hbs b/assets/javascripts/discourse/templates/user-assigned-topics.hbs index e1b9835..98d6e3d 100644 --- a/assets/javascripts/discourse/templates/user-assigned-topics.hbs +++ b/assets/javascripts/discourse/templates/user-assigned-topics.hbs @@ -1,11 +1,12 @@
{{input - class="no-blur" - value=searchTerm - placeholder=(i18n "discourse_assign.topic_search_placeholder") - input=(action "onChangeFilter" value="target.value") - autocomplete="discourse"}} + class="no-blur" + value=searchTerm + placeholder=(i18n "discourse_assign.topic_search_placeholder") + input=(action "onChangeFilter" value="target.value") + autocomplete="discourse" + }}