From c40c858233e8c81e11f501dbabba17da559c6efe Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 4 Feb 2021 14:35:23 -0500 Subject: [PATCH] REFACTOR: Remove d-button block helpers (#11970) --- .../components/email-styles-editor.hbs | 4 +--- .../templates/customize-email-style-edit.hbs | 4 +--- .../addon/templates/customize-themes-edit.hbs | 5 ++--- .../components/group-manage-logs-filter.hbs | 5 +---- .../components/group-manage-logs-row.hbs | 18 ++++-------------- .../components/group-manage-save-button.hbs | 6 ++---- .../app/templates/components/ip-lookup.hbs | 5 ++--- .../components/top-period-buttons.hbs | 4 +--- .../app/templates/mobile/modal/login.hbs | 4 +--- .../app/templates/modal/create-account.hbs | 4 +--- .../app/templates/modal/move-to-topic.hbs | 4 +--- .../app/templates/preferences-email.hbs | 5 ++--- .../app/templates/preferences-username.hbs | 6 ++---- app/assets/stylesheets/common/base/groups.scss | 10 ++++++++++ 14 files changed, 31 insertions(+), 53 deletions(-) diff --git a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs index 742c71a5b34..65fa9174fcf 100644 --- a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs +++ b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs @@ -13,8 +13,6 @@
- {{#d-button action=(action "reset") disabled=resetDisabled class="btn-default"}} - {{i18n "admin.customize.email_style.reset"}} - {{/d-button}} + {{d-button action=(action "reset") disabled=resetDisabled class="btn-default" label="admin.customize.email_style.reset"}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs index 17baf199386..f1ecd8bd1b3 100644 --- a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs +++ b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs @@ -2,8 +2,6 @@
- {{#d-button action=(action "save") disabled=saveDisabled class="btn-primary"}} - {{saveButtonText}} - {{/d-button}} + {{d-button action=(action "save") disabled=saveDisabled class="btn-primary" translatedLabel=saveButtonText}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs index 32e3521f652..1fcfce5a3bd 100644 --- a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs +++ b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs @@ -43,13 +43,12 @@
- {{#d-button + {{d-button action=(action "save") disabled=saveDisabled class="btn-primary" + translatedLabel=saveButtonText }} - {{saveButtonText}} - {{/d-button}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs index f4c4ef7a93b..d439d39c87f 100644 --- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs @@ -1,6 +1,3 @@ {{#if value}} - {{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}} - {{label}}: {{filterText}} - {{d-icon "times-circle"}} - {{/d-button}} + {{d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type icon="times-circle" translatedLabel=(concat label ": " filterText)}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs index d835fb97c68..79466b9d98b 100644 --- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs @@ -1,33 +1,23 @@ - {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action")}} - {{log.actionTitle}} - {{/d-button}} + {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action") translatedLabel=log.actionTitle}} {{avatar log.acting_user imageSize="tiny"}} - - {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}} - {{log.acting_user.username}} - {{/d-button}} + {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user") translatedLabel=log.acting_user.username}} {{#if log.target_user}} {{avatar log.target_user imageSize="tiny"}} - - {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}} - {{log.target_user.username}} - {{/d-button}} + {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user") translatedLabel=log.target_user.username}} {{/if}} {{#if log.subject}} - {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject")}} - {{log.subject}} - {{/d-button}} + {{d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject") translatedLabel=log.subject}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs index a01cf4d3842..11b4167c70f 100644 --- a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs @@ -1,11 +1,9 @@
- {{#d-button action=(action "save") + {{d-button action=(action "save") disabled=saving class="btn btn-primary group-manage-save" + translatedLabel=savingText }} - {{savingText}} - {{/d-button}} - {{#if saved}} {{i18n "saved"}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs index b6980b39d58..fe70b9cdb9a 100644 --- a/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs @@ -45,13 +45,12 @@ {{i18n "ip_lookup.other_accounts"}} {{totalOthersWithSameIP}} {{#if other_accounts.length}} - {{#d-button + {{d-button class="btn-danger pull-right" action=(action "deleteOtherAccounts") icon="exclamation-triangle" + translatedLabel=(i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete) }} - {{i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete}} - {{/d-button}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs index a9686092d97..770688531e9 100644 --- a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs @@ -1,5 +1,3 @@ {{#each periods as |p|}} - {{#d-button action=(action "changePeriod") class="btn-default" actionParam=p}} - {{period-title p}} - {{/d-button}} + {{d-button action=(action "changePeriod") class="btn-default" actionParam=p translatedLabel=(period-title p)}} {{/each}} diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs index 201bc81630b..37279abb92c 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs +++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs @@ -75,9 +75,7 @@ {{/unless}} {{#if showSignupLink}} - {{#d-button class="btn-large" id="new-account-link" action=(route-action "showCreateAccount")}} - {{i18n "create_account.title"}} - {{/d-button}} + {{d-button class="btn-large" id="new-account-link" action=(route-action "showCreateAccount") label="create_account.title"}} {{/if}} {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs index 22e4f7878a5..85ee9a1eb9e 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs @@ -182,9 +182,7 @@ }} {{#unless hasAuthOptions}} - {{#d-button class="btn-large" id="login-link" action=(route-action "showLogin") disabled=formSubmitted}} - {{i18n "log_in"}} - {{/d-button}} + {{d-button class="btn-large" id="login-link" action=(route-action "showLogin") disabled=formSubmitted label="log_in"}} {{/unless}}
{{html-safe disclaimerHtml}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs index 6386cecd2a6..f1861199e01 100644 --- a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs +++ b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs @@ -110,7 +110,5 @@ {{/d-modal-body}}
- {{#d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove")}} - {{d-icon "sign-out-alt"}} {{buttonTitle}} - {{/d-button}} + {{d-button class="btn-primary" disabled=buttonDisabled action=(action "performMove") icon="sign-out-alt" translatedLabel=buttonTitle}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs index 5dd2eb1826c..661ea0eece6 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs @@ -43,14 +43,13 @@
- {{#d-button + {{d-button class="btn-primary" action=(action "saveEmail") type="submit" disabled=saveDisabled + translatedLabel=saveButtonText }} - {{saveButtonText}} - {{/d-button}}
{{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs index c7c59b17d02..977933ba978 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs @@ -24,15 +24,13 @@
- {{#d-button + {{d-button class="btn-primary" action=(action "changeUsername") type="submit" disabled=saveDisabled + translatedLabel=saveButtonText }} - {{saveButtonText}} - {{/d-button}} - {{#if saved}}{{i18n "saved"}}{{/if}}
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss index 3d4e0b33abb..dd8f1e85312 100644 --- a/app/assets/stylesheets/common/base/groups.scss +++ b/app/assets/stylesheets/common/base/groups.scss @@ -160,3 +160,13 @@ } } } + +.group-manage-logs-controls { + button { + .d-icon { + // flip the icon order for the remove button + order: 2; + margin: 0 0 0 0.45em; + } + } +}