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

REFACTOR: Remove d-button block helpers (#11970)

This commit is contained in:
Kris 2021-02-04 14:35:23 -05:00 committed by GitHub
parent 2bc739eaa5
commit c40c858233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
View File

@ -13,8 +13,6 @@
<div class="admin-footer">
<div class="buttons">
{{#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"}}
</div>
</div>

4
app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
View File

@ -2,8 +2,6 @@
<div class="admin-footer">
<div class="buttons">
{{#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}}
</div>
</div>

5
app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
View File

@ -43,13 +43,12 @@
</div>
<div class="buttons">
{{#d-button
{{d-button
action=(action "save")
disabled=saveDisabled
class="btn-primary"
translatedLabel=saveButtonText
}}
{{saveButtonText}}
{{/d-button}}
</div>
</div>
</div>

5
app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
View File

@ -1,6 +1,3 @@
{{#if value}}
{{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
<span>{{label}}</span>: {{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}}

18
app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
View File

@ -1,33 +1,23 @@
<tr class="group-manage-logs-row">
<td>
{{#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}}
</td>
<td>
<span>{{avatar log.acting_user imageSize="tiny"}}</span>
{{#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}}
</td>
<td>
{{#if log.target_user}}
<span>{{avatar log.target_user imageSize="tiny"}}</span>
{{#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}}
</td>
<td>
{{#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}}
</td>

6
app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
View File

@ -1,11 +1,9 @@
<div class="control-group buttons">
{{#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}}
<span>{{i18n "saved"}}</span>
{{/if}}

5
app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs
View File

@ -45,13 +45,12 @@
{{i18n "ip_lookup.other_accounts"}}
<strong>{{totalOthersWithSameIP}}</strong>
{{#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}}
</dt>

4
app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
View File

@ -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}}

4
app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
View File

@ -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}}
</div>

4
app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
View File

@ -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}}
<div class="disclaimer">{{html-safe disclaimerHtml}}</div>

4
app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
View File

@ -110,7 +110,5 @@
{{/d-modal-body}}
<div class="modal-footer">
{{#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}}
</div>

5
app/assets/javascripts/discourse/app/templates/preferences-email.hbs
View File

@ -43,14 +43,13 @@
<div class="control-group">
<div class="controls">
{{#d-button
{{d-button
class="btn-primary"
action=(action "saveEmail")
type="submit"
disabled=saveDisabled
translatedLabel=saveButtonText
}}
{{saveButtonText}}
{{/d-button}}
</div>
</div>
{{/if}}

6
app/assets/javascripts/discourse/app/templates/preferences-username.hbs
View File

@ -24,15 +24,13 @@
<div class="control-group">
<div class="controls">
{{#d-button
{{d-button
class="btn-primary"
action=(action "changeUsername")
type="submit"
disabled=saveDisabled
translatedLabel=saveButtonText
}}
{{saveButtonText}}
{{/d-button}}
{{#if saved}}{{i18n "saved"}}{{/if}}
</div>
</div>

10
app/assets/stylesheets/common/base/groups.scss
View File

@ -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;
}
}
}