github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-11 13:16:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Change composer's edit reason link to an icon

Browse Source
This commit is contained in:
Kris
2019-09-30 20:58:31 -04:00
parent 444d123f0d
commit 5cfbe19eef
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/templates/components/link-to-input.hbs
View File

@ -1,5 +1,12 @@
{{#if showInput}} {{#if showInput}}
{{yield}} {{yield}}
{{else}} {{else}}
<a href>{{i18n key}}</a> <a href>
{{#if key}}
{{i18n key}}
{{/if}}
{{#if icon}}
{{d-icon icon}}
{{/if}}
</a>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/composer.hbs
View File

@ -37,7 +37,7 @@
{{/unless}} {{/unless}}
{{#if canEdit}} {{#if canEdit}}
{{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason key="composer.show_edit_reason" class="display-edit-reason"}} {{#link-to-input onClick=(action "displayEditReason") showInput=showEditReason icon="info-circle" class="display-edit-reason"}}
{{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}} {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
{{/link-to-input}} {{/link-to-input}}
{{/if}} {{/if}}

15
app/assets/stylesheets/common/base/compose.scss
View File

@ -169,12 +169,23 @@
font-style: italic; font-style: italic;
} }
.whisper {
margin-right: 0.25em;
}
.display-edit-reason { .display-edit-reason {
display: inline; display: inline-flex;
a {
display: inline-flex;
}
.d-icon {
padding: 0.3em 0.5em;
color: $tertiary;
}
} }
#edit-reason { #edit-reason {
margin: 4px; margin: 0 4px;
} }
.user-selector, .user-selector,

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

@ -385,8 +385,8 @@ en:
min_score_visibility: "Minimum Score for Visibility" min_score_visibility: "Minimum Score for Visibility"
score_to_hide: "Score to Hide Post" score_to_hide: "Score to Hide Post"
take_action_bonus: take_action_bonus:
name: 'took action' name: "took action"
title: 'When a staff member chooses to take action the flag is given a bonus.' title: "When a staff member chooses to take action the flag is given a bonus."
user_accuracy_bonus: user_accuracy_bonus:
name: "user accuracy" name: "user accuracy"
title: "Users whose flags have been historically agreed with are given a bonus." title: "Users whose flags have been historically agreed with are given a bonus."
@ -1645,7 +1645,6 @@ en:
title_placeholder: "What is this discussion about in one brief sentence?" title_placeholder: "What is this discussion about in one brief sentence?"
title_or_link_placeholder: "Type title, or paste a link here" title_or_link_placeholder: "Type title, or paste a link here"
edit_reason_placeholder: "why are you editing?" edit_reason_placeholder: "why are you editing?"
show_edit_reason: "(add edit reason)"
topic_featured_link_placeholder: "Enter link shown with title." topic_featured_link_placeholder: "Enter link shown with title."
remove_featured_link: "Remove link from topic." remove_featured_link: "Remove link from topic."
reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images." reply_placeholder: "Type here. Use Markdown, BBCode, or HTML to format. Drag or paste images."