discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix template linting issues

This commit is contained in:
Jarek Radosz 2021-02-09 20:33:44 +01:00
parent 0f2475708e
commit b560cf1002
10 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/javascripts/discourse/templates/components/assigned-topic-list-item.hbs
View File

@ -10,8 +10,8 @@
<input type="checkbox" class="bulk-select"> <input type="checkbox" class="bulk-select">
</td> </td>
{{/if}} {{/if}}
<td class='main-link clearfix' colspan="1"> <td class="main-link clearfix" colspan="1">
<span class='link-top-line'> <span class="link-top-line">
{{~raw "topic-status" topic=topic}} {{~raw "topic-status" topic=topic}}
{{~#if isPrivateMessage}} {{~#if isPrivateMessage}}
{{~d-icon "envelope" class="private-message-icon"}} {{~d-icon "envelope" class="private-message-icon"}}
@ -48,8 +48,10 @@
{{raw "list/activity-column" topic=topic class="num" tagName="td"}} {{raw "list/activity-column" topic=topic class="num" tagName="td"}}
<td> <td>
{{assign-actions-dropdown topic=topic {{assign-actions-dropdown
user=username topic=topic
unassign=unassign user=username
reassign=reassign}} unassign=unassign
reassign=reassign
}}
</td> </td>

33
assets/javascripts/discourse/templates/components/assigned-topic-list.hbs
View File

@ -11,26 +11,29 @@
ascending=ascending ascending=ascending
sortable=sortable sortable=sortable
listTitle=listTitle listTitle=listTitle
bulkSelectEnabled=bulkSelectEnabled}} bulkSelectEnabled=bulkSelectEnabled
}}
</thead> </thead>
{{/unless}} {{/unless}}
<tbody> <tbody>
{{#each filteredTopics as |topic|}} {{#each filteredTopics as |topic|}}
{{assigned-topic-list-item topic=topic {{assigned-topic-list-item
bulkSelectEnabled=bulkSelectEnabled topic=topic
showTopicPostBadges=showTopicPostBadges bulkSelectEnabled=bulkSelectEnabled
hideCategory=hideCategory showTopicPostBadges=showTopicPostBadges
showPosters=showPosters hideCategory=hideCategory
showLikes=showLikes showPosters=showPosters
showOpLikes=showOpLikes showLikes=showLikes
expandGloballyPinned=expandGloballyPinned showOpLikes=showOpLikes
expandAllPinned=expandAllPinned expandGloballyPinned=expandGloballyPinned
lastVisitedTopic=lastVisitedTopic expandAllPinned=expandAllPinned
selected=selected lastVisitedTopic=lastVisitedTopic
tagsForUser=tagsForUser selected=selected
unassign=unassign tagsForUser=tagsForUser
reassign=reassign}} unassign=unassign
reassign=reassign
}}
{{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}} {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
{{/each}} {{/each}}

40
assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs
View File

@ -1,30 +1,30 @@
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#if hasIncoming}} {{#if hasIncoming}}
<div class="show-mores"> <div class="show-mores">
<div class="alert alert-info clickable" {{action showInserted}}> <a href class="alert alert-info clickable" {{action showInserted}}>
<a tabindex="0" href="" {{action showInserted}}> {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}} </a>
</a>
</div>
</div> </div>
{{/if}} {{/if}}
{{#if topics}} {{#if topics}}
{{assigned-topic-list showPosters=showPosters {{assigned-topic-list
hideCategory=hideCategory showPosters=showPosters
topics=topics hideCategory=hideCategory
expandExcerpts=expandExcerpts topics=topics
bulkSelectEnabled=bulkSelectEnabled expandExcerpts=expandExcerpts
canBulkSelect=canBulkSelect bulkSelectEnabled=bulkSelectEnabled
selected=selected canBulkSelect=canBulkSelect
skipHeader=skipHeader selected=selected
tagsForUser=tagsForUser skipHeader=skipHeader
changeSort=changeSort tagsForUser=tagsForUser
toggleBulkSelect=toggleBulkSelect changeSort=changeSort
unassign=unassign toggleBulkSelect=toggleBulkSelect
reassign=reassign unassign=unassign
onScroll=onScroll reassign=reassign
scrollOnLoad=scrollOnLoad}} onScroll=onScroll
scrollOnLoad=scrollOnLoad
}}
{{else}} {{else}}
{{#unless loadingMore}} {{#unless loadingMore}}
<div class="alert alert-info"> <div class="alert alert-info">

9
assets/javascripts/discourse/templates/components/claim-topic.hbs
View File

@ -5,13 +5,16 @@
class="btn-small unassign" class="btn-small unassign"
action=(action "unassign") action=(action "unassign")
disabled=unassigning disabled=unassigning
title="discourse_assign.unassign.help"}} title="discourse_assign.unassign.help"
}}
{{/assigned-to}} {{/assigned-to}}
{{else}} {{else}}
{{d-button class="btn-small assign" {{d-button
class="btn-small assign"
icon="user-plus" icon="user-plus"
action=(action "claim") action=(action "claim")
disabled=claiming disabled=claiming
label="discourse_assign.claim.title" label="discourse_assign.claim.title"
title="discourse_assign.claim.help"}} title="discourse_assign.claim.help"
}}
{{/if}} {{/if}}

11
assets/javascripts/discourse/templates/group-topics-list.hbs
View File

@ -1,11 +1,12 @@
<div class="topic-search-div"> <div class="topic-search-div">
<div class="form-horizontal bookmark-search-form"> <div class="form-horizontal bookmark-search-form">
{{input {{input
class="no-blur" class="no-blur"
value=searchTerm value=searchTerm
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder=(i18n "discourse_assign.topic_search_placeholder")
input=(action "onChangeFilter" value="target.value") input=(action "onChangeFilter" value="target.value")
autocomplete="discourse"}} autocomplete="discourse"
}}
</div> </div>
</div> </div>
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}} {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}

6
assets/javascripts/discourse/templates/group/assigned.hbs
View File

@ -19,7 +19,8 @@
assignmentCount=group.assignment_count assignmentCount=group.assignment_count
search=search search=search
ascending=ascending ascending=ascending
order=order}} order=order
}}
{{#each members as |member|}} {{#each members as |member|}}
{{group-assigned-filter {{group-assigned-filter
show-avatar=true show-avatar=true
@ -27,7 +28,8 @@
routeType=route_type routeType=route_type
search=search search=search
ascending=ascending ascending=ascending
order=order}} order=order
}}
{{/each}} {{/each}}
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
{{/load-more}} {{/load-more}}

4
assets/javascripts/discourse/templates/mobile/components/assigned-topic-list-item.hbs
View File

@ -12,7 +12,7 @@
<div class="topic-excerpt"> <div class="topic-excerpt">
{{html-safe topic.excerpt}} {{html-safe topic.excerpt}}
{{#if topic.excerptTruncated}} {{#if topic.excerptTruncated}}
{{#unless topic.canClearPin}}<a href={{unbound topic.url}}>{{i18n "read_more"}}</a>{{/unless}} {{#unless topic.canClearPin}}<a href={{topic.url}}>{{i18n "read_more"}}</a>{{/unless}}
{{/if}} {{/if}}
{{#if topic.canClearPin}} {{#if topic.canClearPin}}
<a href {{action "clearPin" topic}} title={{i18n "topic.clear_pin.help"}}>{{i18n "topic.clear_pin.title"}}</a> <a href {{action "clearPin" topic}} title={{i18n "topic.clear_pin.help"}}>{{i18n "topic.clear_pin.title"}}</a>
@ -33,7 +33,7 @@
{{discourse-tags topic mode="list" tagsForUser=tagsForUser}} {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
<div class="pull-right"> <div class="pull-right">
{{raw "list/activity-column" topic=topic tagName="div" class="num activity last"}} {{raw "list/activity-column" topic=topic tagName="div" class="num activity last"}}
<a href={{topic.lastPostUrl}} title="{{i18n 'last_post'}}: {{html-safe raw-date topic.bumped_at}}">{{topic.last_poster_username}}</a> <a href={{topic.lastPostUrl}} title="{{i18n "last_post"}}: {{html-safe raw-date topic.bumped_at}}">{{topic.last_poster_username}}</a>
</div> </div>
{{#unless hideCategory}} {{#unless hideCategory}}
<div class="category"> <div class="category">

4
assets/javascripts/discourse/templates/mobile/components/basic-assigned-topic-list.hbs
View File

@ -1,9 +1,9 @@
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#if hasIncoming}} {{#if hasIncoming}}
<div class="show-mores"> <div class="show-mores">
<div class="alert alert-info clickable" {{action showInserted}}> <a href class="alert alert-info clickable" {{action showInserted}}>
{{count-i18n key="topic_count_" suffix="latest" count=incomingCount}} {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
</div> </a>
</div> </div>
{{/if}} {{/if}}

2
assets/javascripts/discourse/templates/modal/assign-user.hbs
View File

@ -15,7 +15,7 @@
}} }}
<div class="assign-suggestions"> <div class="assign-suggestions">
{{#each assignSuggestions as |user|}} {{#each assignSuggestions as |user|}}
<a {{action "assignUser" user}}> <a href {{action "assignUser" user}}>
{{avatar user imageSize="small"}} {{avatar user imageSize="small"}}
</a> </a>
{{/each}} {{/each}}

11
assets/javascripts/discourse/templates/user-assigned-topics.hbs
View File

@ -1,11 +1,12 @@
<div class="topic-search-div"> <div class="topic-search-div">
<div class="form-horizontal bookmark-search-form"> <div class="form-horizontal bookmark-search-form">
{{input {{input
class="no-blur" class="no-blur"
value=searchTerm value=searchTerm
placeholder=(i18n "discourse_assign.topic_search_placeholder") placeholder=(i18n "discourse_assign.topic_search_placeholder")
input=(action "onChangeFilter" value="target.value") input=(action "onChangeFilter" value="target.value")
autocomplete="discourse"}} autocomplete="discourse"
}}
</div> </div>
</div> </div>