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

UX: Move 'show words' checkbox close to the words in the Watched Words UI

This commit is contained in:
Neil Lalonde 2018-02-26 16:35:43 -05:00
parent 436d2b57c9
commit 8f27456acb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/watched-words-action.hbs
View File

@ -10,6 +10,12 @@
{{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}} {{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
<div class='clearfix'></div> <div class='clearfix'></div>
<div>
<label class="show-words-checkbox">
{{input type="checkbox" checked=adminWatchedWords.showWords disabled=adminWatchedWords.disableShowWords}}
{{i18n 'admin.watched_words.show_words'}}
</label>
</div>
<div class="watched-words-list"> <div class="watched-words-list">
{{#if showWordsList}} {{#if showWordsList}}
{{#each filteredContent as |word| }} {{#each filteredContent as |word| }}

6
app/assets/javascripts/admin/templates/watched-words.hbs
View File

@ -1,10 +1,4 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='search controls'>
<label class="show-words-checkbox">
{{input type="checkbox" checked=showWords disabled=disableShowWords}}
{{i18n 'admin.watched_words.show_words'}}
</label>
</div>
<div class='controls'> <div class='controls'>
{{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}} {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
{{d-button action="clearFilter" label="admin.watched_words.clear_filter"}} {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}

2
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -1778,7 +1778,7 @@ table#user-badges {
} }
.watched-words-list { .watched-words-list {
margin-top: 40px; margin-top: 20px;
} }
.watched-word { .watched-word {
display: inline-block; display: inline-block;