IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 03:10:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Move link to show tracked topics, simplify translation

Browse Source
This commit is contained in:
Kris 2019-06-27 21:36:24 -04:00
parent 27387b0859
commit 82f2af8a0d
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/templates/preferences/categories.hbs
View File

@ -3,25 +3,23 @@
<div class="controls tracking-controls">
<label>{{d-icon "d-watching"}} {{i18n 'user.watched_categories'}}</label>
{{#if canSee}}
<a class="show-tracking" href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
{{/if}}
{{category-selector categories=model.watchedCategories blacklist=selectedCategories}}
</div>
<div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
{{#if canSee}}
<div class="controls">
<a href="{{unbound model.watchingTopicsPath}}">{{i18n 'user.watched_topics_link'}}</a>
</div>
{{/if}}
<div class="controls tracking-controls">
<label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
{{#if canSee}}
<a class="show-tracking" href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
{{/if}}
{{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
</div>
<div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
{{#if canSee}}
<div class="controls">
<a href="{{unbound model.trackingTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
</div>
{{/if}}
<div class="controls tracking-controls">
<label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
@ -31,14 +29,12 @@
<div class="controls tracking-controls">
<label>{{d-icon "d-muted"}} {{i18n 'user.muted_categories'}}</label>
{{#if canSee}}
<a class="show-tracking" href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.tracked_topics_link'}}</a>
{{/if}}
{{category-selector categories=model.mutedCategories blacklist=selectedCategories}}
</div>
<div class="instructions">{{i18n (if hideMutedTags 'user.muted_categories_instructions' 'user.muted_categories_instructions_dont_hide')}}</div>
{{#if canSee}}
<div class="controls">
<a href="{{unbound model.mutedTopicsPath}}">{{i18n 'user.muted_topics_link'}}</a>
</div>
{{/if}}
</div>
{{plugin-outlet name="user-preferences-categories" args=(hash model=model save=(action "save"))}}

9
app/assets/stylesheets/common/base/user.scss
View File

@ -546,10 +546,19 @@
.tracking-controls {
label {
align-items: center;
display: inline-block;
.d-icon {
margin-right: 3px;
}
}
.select-kit.multi-select {
@include breakpoint(mobile) {
width: 100%;
}
}
.show-tracking {
float: right;
}
}
.static {

4
config/locales/client.en.yml
View File

@ -868,9 +868,7 @@ en:
muted_users_instructions: "Suppress all notifications from these users."
ignored_users: "Ignored"
ignored_users_instructions: "Suppress all posts and notifications from these users."
muted_topics_link: "Show muted topics"
watched_topics_link: "Show watched topics"
tracked_topics_link: "Show tracked topics"
tracked_topics_link: "Show"
automatically_unpin_topics: "Automatically unpin topics when I reach the bottom."
apps: "Apps"
revoke_access: "Revoke Access"