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

DEV: Update icon structure in bootbox buttons (#11925)

This commit is contained in:
Kris 2021-02-02 15:47:10 -05:00 committed by GitHub
parent 75d766499f
commit 2ee63a6a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/admin/addon/controllers/admin-user-index.js
View File

@ -315,9 +315,8 @@ export default Controller.extend(CanCheckEmails, {
link: true,
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.delete_all_posts"),
icon: iconHTML("exclamation-triangle"),
label: I18n.t("admin.user.delete_all_posts"),
class: "btn btn-danger",
callback: () => {
const progressModal = openProgressModal();
@ -367,10 +366,9 @@ export default Controller.extend(CanCheckEmails, {
link: true,
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.anonymize_yes"),
label: I18n.t("admin.user.anonymize_yes"),
class: "btn btn-danger",
icon: iconHTML("exclamation-triangle"),
callback: () => {
performAnonymize();
},
@ -435,9 +433,8 @@ export default Controller.extend(CanCheckEmails, {
link: true,
},
{
label:
`${iconHTML("exclamation-triangle")} ` +
I18n.t("admin.user.delete_and_block"),
icon: iconHTML("exclamation-triangle"),
label: I18n.t("admin.user.delete_and_block"),
class: "btn btn-danger",
callback: () => {
performDestroy(true);

3
app/assets/javascripts/discourse/app/controllers/preferences/second-factor.js
View File

@ -131,7 +131,8 @@ export default Controller.extend(CanCheckEmails, {
link: true,
},
{
label: `${iconHTML("ban")}${I18n.t("user.second_factor.disable")}`,
icon: iconHTML("ban"),
label: I18n.t("user.second_factor.disable"),
class: "btn-danger btn-icon-text",
callback: () => {
this.model

4
vendor/assets/javascripts/bootbox.js vendored
View File

@ -340,7 +340,7 @@ var bootbox = window.bootbox || (function(document, $) {
}
if (handlers[i]['icon']) {
icon = "<i class='"+handlers[i]['icon']+"'></i> ";
icon = handlers[i]['icon'];
}
if (handlers[i]['href']) {
@ -350,7 +350,7 @@ var bootbox = window.bootbox || (function(document, $) {
href = _defaultHref;
}
buttons = buttons + "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+""+label+"</a>";
buttons = buttons + "<a data-handler='"+i+"' class='"+_class+"' href='" + href + "'>"+icon+"<span class='d-button-label'>"+label+"</span></a>";
callbacks[i] = callback;
}