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

UX: chat leave info (#24645) 

* UX: add info-warning to leave button

* Scope to groupchat

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
This commit is contained in:
chapoi 2023-11-30 11:13:37 +02:00 committed by GitHub
parent 91ab2766e9
commit 1b022457ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/chat/assets/javascripts/discourse/components/chat-channel-settings.gjs
View File

@ -9,6 +9,8 @@ import DToggleSwitch from "discourse/components/d-toggle-switch";
import categoryBadge from "discourse/helpers/category-badge"; import categoryBadge from "discourse/helpers/category-badge";
import replaceEmoji from "discourse/helpers/replace-emoji"; import replaceEmoji from "discourse/helpers/replace-emoji";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import icon from "discourse-common/helpers/d-icon";
import i18n from "discourse-common/helpers/i18n";
import I18n from "discourse-i18n"; import I18n from "discourse-i18n";
import ComboBox from "select-kit/components/combo-box"; import ComboBox from "select-kit/components/combo-box";
import ChatForm from "discourse/plugins/chat/discourse/components/chat/form"; import ChatForm from "discourse/plugins/chat/discourse/components/chat/form";
@ -591,7 +593,14 @@ export default class ChatAboutScreen extends Component {
/> />
</:action> </:action>
</section.row> </section.row>
{{#unless @channel.isCategoryChannel}}
<div class="chat-channel-settings__leave-info">
{{icon "exclamation-triangle"}}
{{i18n "chat.channel_settings.leave_groupchat_info"}}
</div>
{{/unless}}
</form.section> </form.section>
</ChatForm> </ChatForm>
</div> </div>
</template> </template>

13
plugins/chat/assets/stylesheets/common/chat-channel-settings.scss
View File

@ -9,4 +9,17 @@
.chat-retention-reminder-text { .chat-retention-reminder-text {
color: var(--primary-medium); color: var(--primary-medium);
} }
&__leave-info {
font-size: var(--font-down-1-rem);
color: var(--primary-medium);
.d-icon {
color: var(--danger);
}
}
.chat-form__section-content:has(.chat-channel-settings__leave-info) {
gap: 0.25rem;
}
} }

1
plugins/chat/config/locales/client.en.yml
View File

@ -62,6 +62,7 @@ en:
delete_channel: "Delete channel" delete_channel: "Delete channel"
join_channel: "Join channel" join_channel: "Join channel"
leave_channel: "Leave channel" leave_channel: "Leave channel"
leave_groupchat_info: "By leaving this group chat, you will no longer have access to it and won’t receive notifications related to it. To rejoin, you will need to be re-invited by a member of the group chat."
join: "Join" join: "Join"
leave: "Leave" leave: "Leave"
save_label: save_label: