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

Add btn-default class to all default buttons (#6521)

This commit is contained in:
Kris 2018-10-24 16:09:36 -04:00 committed by GitHub
parent 0140844eb0
commit c219a5fb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 219 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/components/admin-report.js.es6
View File

@ -140,7 +140,7 @@ export default Ember.Component.extend({
const modes = forcedModes ? forcedModes.split(",") : reportModes; const modes = forcedModes ? forcedModes.split(",") : reportModes;
return Ember.makeArray(modes).map(mode => { return Ember.makeArray(modes).map(mode => {
const base = `mode-btn ${mode}`; const base = `btn-default mode-btn ${mode}`;
const cssClass = currentMode === mode ? `${base} is-current` : base; const cssClass = currentMode === mode ? `${base} is-current` : base;
return { return {

4
app/assets/javascripts/admin/templates/api-keys.hbs
View File

@ -19,8 +19,8 @@
{{/if}} {{/if}}
</td> </td>
<td class="key-controls"> <td class="key-controls">
{{d-button action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}} {{d-button class="btn-default" action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}}
{{d-button action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}} {{d-button class="btn-default" action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}

12
app/assets/javascripts/admin/templates/backups-index.hbs
View File

@ -1,14 +1,14 @@
<div class="backup-options"> <div class="backup-options">
{{#if localBackupStorage}} {{#if localBackupStorage}}
{{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title"}} {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title" class="btn-default"}}
{{else}} {{else}}
{{backup-uploader done="remoteUploadSuccess"}} {{backup-uploader done="remoteUploadSuccess"}}
{{/if}} {{/if}}
{{#if site.isReadOnly}} {{#if site.isReadOnly}}
{{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}} {{d-button class="btn-default" icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
{{else}} {{else}}
{{d-button icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}} {{d-button class="btn-default" icon="eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
{{/if}} {{/if}}
</div> </div>
<table class="grid"> <table class="grid">
@ -24,7 +24,7 @@
<td class="backup-size">{{human-size backup.size}}</td> <td class="backup-size">{{human-size backup.size}}</td>
<td class="backup-controls"> <td class="backup-controls">
<div> <div>
{{d-button class="download" {{d-button class="btn-default download"
action="download" action="download"
actionParam=backup actionParam=backup
icon="download" icon="download"
@ -32,10 +32,10 @@
label="admin.backups.operations.download.label"}} label="admin.backups.operations.download.label"}}
{{#if status.isOperationRunning}} {{#if status.isOperationRunning}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
{{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
{{else}} {{else}}
{{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}} {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
{{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
{{/if}} {{/if}}
</div> </div>
</td> </td>

2
app/assets/javascripts/admin/templates/backups.hbs
View File

@ -8,7 +8,7 @@
<div class="admin-actions"> <div class="admin-actions">
{{#if model.canRollback}} {{#if model.canRollback}}
{{d-button action="rollback" {{d-button action="rollback"
class="btn-rollback" class="btn-default btn-rollback"
label="admin.backups.operations.rollback.label" label="admin.backups.operations.rollback.label"
title="admin.backups.operations.rollback.title" title="admin.backups.operations.rollback.title"
icon="ambulance" icon="ambulance"

2
app/assets/javascripts/admin/templates/badges-index.hbs
View File

@ -2,7 +2,7 @@
<p>{{i18n 'admin.badges.none_selected'}}</p> <p>{{i18n 'admin.badges.none_selected'}}</p>
<div> <div>
{{#link-to 'adminBadges.show' 'new' class="btn"}} {{#link-to 'adminBadges.show' 'new' class="btn btn-default"}}
{{d-icon "plus"}} {{i18n 'admin.badges.new'}} {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}} {{/link-to}}
</div> </div>

2
app/assets/javascripts/admin/templates/badges-show.hbs
View File

@ -36,7 +36,7 @@
value=buffered.badge_grouping_id value=buffered.badge_grouping_id
content=badgeGroupings content=badgeGroupings
nameProperty="name"}} nameProperty="name"}}
&nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button> &nbsp;<button {{action "editGroupings"}} class='btn btn-icon btn-default'>{{d-icon 'pencil'}}</button>
</div> </div>

2
app/assets/javascripts/admin/templates/badges.hbs
View File

@ -14,7 +14,7 @@
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
{{#link-to 'adminBadges.show' 'new' class="btn"}} {{#link-to 'adminBadges.show' 'new' class="btn btn-default"}}
{{d-icon "plus"}} {{i18n 'admin.badges.new'}} {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
{{/link-to}} {{/link-to}}
<br> <br>

2
app/assets/javascripts/admin/templates/components/admin-report.hbs
View File

@ -167,7 +167,7 @@
<div class="control"> <div class="control">
<div class="input"> <div class="input">
{{d-button {{d-button
class="export-csv-btn" class="btn-default export-csv-btn"
action="exportCsv" action="exportCsv"
label="admin.export_csv.button_text" label="admin.export_csv.button_text"
icon="download"}} icon="download"}}

4
app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
View File

@ -48,8 +48,8 @@
<div class='form-element controls'> <div class='form-element controls'>
{{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}} {{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}}
{{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}} {{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}}
{{d-button action="moveUp" icon="arrow-up" disabled=cantMoveUp}} {{d-button action="moveUp" class="btn-default" icon="arrow-up" disabled=cantMoveUp}}
{{d-button action="moveDown" icon="arrow-down" disabled=cantMoveDown}} {{d-button action="moveDown" class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
</div> </div>
</div> </div>
<div class="row">{{flags}}</div> <div class="row">{{flags}}</div>

7
app/assets/javascripts/admin/templates/components/flagged-post.hbs
View File

@ -77,21 +77,21 @@
{{#if flaggedPost.postHidden}} {{#if flaggedPost.postHidden}}
{{d-button {{d-button
title="admin.flags.disagree_flag_unhide_post_title" title="admin.flags.disagree_flag_unhide_post_title"
class="disagree-flag" class="btn-default disagree-flag"
action="disagree" action="disagree"
icon="thumbs-o-down" icon="thumbs-o-down"
label="admin.flags.disagree_flag_unhide_post"}} label="admin.flags.disagree_flag_unhide_post"}}
{{else}} {{else}}
{{d-button {{d-button
title="admin.flags.disagree_flag_title" title="admin.flags.disagree_flag_title"
class="disagree-flag" class="btn-default disagree-flag"
action="disagree" action="disagree"
icon="thumbs-o-down" icon="thumbs-o-down"
label="admin.flags.disagree_flag"}} label="admin.flags.disagree_flag"}}
{{/if}} {{/if}}
{{d-button {{d-button
class="defer-flag" class="btn-default defer-flag"
title="admin.flags.ignore_flag_title" title="admin.flags.ignore_flag_title"
action="defer" action="defer"
icon="external-link" icon="external-link"
@ -103,6 +103,7 @@
{{/if}} {{/if}}
{{d-button {{d-button
class="btn-default"
icon="list" icon="list"
label="admin.flags.moderation_history" label="admin.flags.moderation_history"
action=(action "showModerationHistory")}} action=(action "showModerationHistory")}}

2
app/assets/javascripts/admin/templates/components/permalink-form.hbs
View File

@ -2,4 +2,4 @@
{{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}} {{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}}
{{combo-box content=permalinkTypes value=permalinkType}} {{combo-box content=permalinkTypes value=permalinkType}}
{{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}} {{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}}
{{d-button action="submit" disabled=formSubmitted label="admin.permalink.form.add"}} {{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.permalink.form.add"}}

2
app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
View File

@ -1,4 +1,4 @@
<b>{{i18n 'admin.logs.screened_ips.form.label'}}</b> <b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
{{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}} {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
{{combo-box content=actionNames value=actionName}} {{combo-box content=actionNames value=actionName}}
{{d-button action="submit" disabled=formSubmitted label="admin.logs.screened_ips.form.add"}} {{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.logs.screened_ips.form.add"}}

2
app/assets/javascripts/admin/templates/components/site-setting.hbs
View File

@ -13,5 +13,5 @@
{{#if setting.secret}} {{#if setting.secret}}
{{d-button action="toggleSecret" icon="eye-slash"}} {{d-button action="toggleSecret" icon="eye-slash"}}
{{/if}} {{/if}}
{{d-button class="undo" action="resetDefault" icon="undo" label="admin.settings.reset"}} {{d-button class="btn-default undo" action="resetDefault" icon="undo" label="admin.settings.reset"}}
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/components/site-text-summary.hbs
View File

@ -1,4 +1,4 @@
{{d-button label="admin.site_text.edit" class='edit' action="edit"}} {{d-button label="admin.site_text.edit" class='btn-default edit' action="edit"}}
<h3 class='site-text-id'>{{siteText.id}}</h3> <h3 class='site-text-id'>{{siteText.id}}</h3>
<div class='site-text-value'>{{siteText.value}}</div> <div class='site-text-value'>{{siteText.value}}</div>

2
app/assets/javascripts/admin/templates/components/value-list.hbs
View File

@ -5,7 +5,7 @@
{{d-button action="removeValue" {{d-button action="removeValue"
actionParam=value actionParam=value
icon="times" icon="times"
class="remove-value-btn btn-small"}} class="btn-default remove-value-btn btn-small"}}
{{input title=value value=value class="value-input" focus-out=(action "changeValue" index)}} {{input title=value value=value class="value-input" focus-out=(action "changeValue" index)}}
</div> </div>

2
app/assets/javascripts/admin/templates/components/watched-word-form.hbs
View File

@ -1,6 +1,6 @@
<b>{{i18n 'admin.watched_words.form.label'}}</b> <b>{{i18n 'admin.watched_words.form.label'}}</b>
{{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}} {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
{{d-button action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}} {{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}}
{{#if showMessage}} {{#if showMessage}}
<span class="success-message">{{message}}</span> <span class="success-message">{{message}}</span>

2
app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
View File

@ -1,4 +1,4 @@
<label class="btn {{if addDisabled 'disabled'}}"> <label class="btn btn-default {{if addDisabled 'disabled'}}">
{{d-icon "upload"}} {{d-icon "upload"}}
{{i18n 'admin.watched_words.form.upload'}} {{i18n 'admin.watched_words.form.upload'}}
<input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv" /> <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv" />

10
app/assets/javascripts/admin/templates/customize-colors-show.hbs
View File

@ -3,10 +3,10 @@
<h1>{{#if model.theme_id}}{{model.name}}{{else}}{{text-field class="style-name" value=model.name}}{{/if}}</h1> <h1>{{#if model.theme_id}}{{model.name}}{{else}}{{text-field class="style-name" value=model.name}}{{/if}}</h1>
<div class="controls"> <div class="controls">
{{#unless model.theme_id}} {{#unless model.theme_id}}
<button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'admin.customize.save'}}</button> <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
{{/unless}} {{/unless}}
<button {{action "copy" model}} class='btn'>{{d-icon "copy"}} {{i18n 'admin.customize.copy'}}</button> <button {{action "copy" model}} class='btn btn-default'>{{d-icon "copy"}} {{i18n 'admin.customize.copy'}}</button>
<button {{action "copyToClipboard" model}} class='btn'>{{d-icon "clipboard"}} {{i18n 'admin.customize.copy_to_clipboard'}}</button> <button {{action "copyToClipboard" model}} class='btn btn-default'>{{d-icon "clipboard"}} {{i18n 'admin.customize.copy_to_clipboard'}}</button>
{{#if model.theme_id}} {{#if model.theme_id}}
{{i18n "admin.customize.theme_owner"}} {{i18n "admin.customize.theme_owner"}}
{{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}} {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
@ -47,8 +47,8 @@
<td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td> <td class="hex">{{color-input hexValue=c.hex brightnessValue=c.brightness valid=c.valid}}</td>
<td class="actions"> <td class="actions">
{{#unless model.theme_id}} {{#unless model.theme_id}}
<button class="btn revert {{unless c.savedIsOverriden 'invisible'}}" {{action "revert" c}} title="{{i18n 'admin.customize.colors.revert_title'}}">{{i18n 'revert'}}</button> <button class="btn btn-default revert {{unless c.savedIsOverriden 'invisible'}}" {{action "revert" c}} title="{{i18n 'admin.customize.colors.revert_title'}}">{{i18n 'revert'}}</button>
<button class="btn undo {{unless c.changed 'invisible'}}" {{action "undo" c}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button> <button class="btn btn-default undo {{unless c.changed 'invisible'}}" {{action "undo" c}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button>
{{/unless}} {{/unless}}
</td> </td>
</tr> </tr>

2
app/assets/javascripts/admin/templates/customize-colors.hbs
View File

@ -9,7 +9,7 @@
{{/unless}} {{/unless}}
{{/each}} {{/each}}
</ul> </ul>
<button {{action "newColorScheme"}} class='btn'>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button> <button {{action "newColorScheme"}} class='btn btn-default'>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
</div> </div>
{{outlet}} {{outlet}}

22
app/assets/javascripts/admin/templates/customize-themes-show.hbs
View File

@ -50,10 +50,10 @@
icon="paint-brush"}} icon="paint-brush"}}
{{#if colorSchemeChanged}} {{#if colorSchemeChanged}}
{{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}} {{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}}
{{d-button action="cancelChangeScheme" class="btn-small cancel-edit" icon="times"}} {{d-button action="cancelChangeScheme" class="btn-default btn-small cancel-edit" icon="times"}}
{{/if}} {{/if}}
</div> </div>
{{#link-to 'adminCustomize.colors' class="btn edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}} {{#link-to 'adminCustomize.colors' class="btn btn-default edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
</div> </div>
{{/unless}} {{/unless}}
@ -76,11 +76,11 @@
{{#if model.remote_theme.commits_behind}} {{#if model.remote_theme.commits_behind}}
{{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}} {{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
{{else}} {{else}}
{{#d-button action="checkForThemeUpdates" icon="refresh"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}} {{#d-button action="checkForThemeUpdates" icon="refresh" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#d-button action="editTheme" class="btn edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}} {{#d-button action="editTheme" class="btn btn-default edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
{{#if model.remote_theme}} {{#if model.remote_theme}}
<span class='status-message'> <span class='status-message'>
{{#if updatingRemote}} {{#if updatingRemote}}
@ -119,7 +119,7 @@
<li> <li>
<span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span> <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
<span class='col'> <span class='col'>
{{d-button action="removeUpload" actionParam=upload class="second btn-small cancel-edit" icon="times"}} {{d-button action="removeUpload" actionParam=upload class="second btn-default btn-small cancel-edit" icon="times"}}
</span> </span>
</li> </li>
{{/each}} {{/each}}
@ -127,7 +127,7 @@
{{else}} {{else}}
<div class="description">{{i18n "admin.customize.theme.no_uploads"}}</div> <div class="description">{{i18n "admin.customize.theme.no_uploads"}}</div>
{{/if}} {{/if}}
{{#d-button action="addUploadModal" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}} {{#d-button action="addUploadModal" class="btn-default" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
</div> </div>
{{#if hasSettings}} {{#if hasSettings}}
@ -147,22 +147,22 @@
{{#if model.childThemes.length}} {{#if model.childThemes.length}}
<ul class='removable-list'> <ul class='removable-list'>
{{#each model.childThemes as |child|}} {{#each model.childThemes as |child|}}
<li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action="removeChildTheme" actionParam=child class="btn-small cancel-edit col" icon="times"}}</li> <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action="removeChildTheme" actionParam=child class="btn-default btn-small cancel-edit col" icon="times"}}</li>
{{/each}} {{/each}}
</ul> </ul>
{{/if}} {{/if}}
{{#if selectableChildThemes}} {{#if selectableChildThemes}}
<div class="description"> <div class="description">
{{combo-box forceEscape=true filterable=true content=selectableChildThemes value=selectedChildThemeId none="admin.customize.theme.select_component"}} {{combo-box forceEscape=true filterable=true content=selectableChildThemes value=selectedChildThemeId none="admin.customize.theme.select_component"}}
{{#d-button action="addChildTheme" icon="plus" disabled=addButtonDisabled class="add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}} {{#d-button action="addChildTheme" icon="plus" disabled=addButtonDisabled class="btn-default add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a> <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
<a class="btn export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a> <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
{{d-button action="switchType" label="admin.customize.theme.convert" icon=convertIcon class="btn-normal" title=convertTooltip}} {{d-button action="switchType" label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
{{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}} {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}}
</div> </div>

2
app/assets/javascripts/admin/templates/customize-themes.hbs
View File

@ -4,7 +4,7 @@
<div class="create-actions"> <div class="create-actions">
{{d-button label="admin.customize.new" icon="plus" action="showCreateModal" class="btn-primary"}} {{d-button label="admin.customize.new" icon="plus" action="showCreateModal" class="btn-primary"}}
{{d-button action="importModal" icon="upload" label="admin.customize.import"}} {{d-button action="importModal" icon="upload" label="admin.customize.import" class="btn-default"}}
</div> </div>
</div> </div>
{{themes-list themes=fullThemes components=childThemes currentTab=currentTab}} {{themes-list themes=fullThemes components=childThemes currentTab=currentTab}}

2
app/assets/javascripts/admin/templates/dashboard-problems.hbs
View File

@ -19,7 +19,7 @@
<p class="actions"> <p class="actions">
<small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small> <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
{{d-button action="refreshProblems" class="btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}} {{d-button action="refreshProblems" class="btn-default btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
</p> </p>
{{/conditional-loading-section}} {{/conditional-loading-section}}
</div> </div>

2
app/assets/javascripts/admin/templates/dashboard_next_general.hbs
View File

@ -137,7 +137,7 @@
<div> <div>
<h4>{{i18n "admin.dashboard.last_updated"}} </h4> <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
<p>{{updatedTimestamp}}</p> <p>{{updatedTimestamp}}</p>
<a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn"> <a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn btn-default">
{{i18n "admin.dashboard.whats_new_in_discourse"}} {{i18n "admin.dashboard.whats_new_in_discourse"}}
</a> </a>
</div> </div>

2
app/assets/javascripts/admin/templates/email-preview-digest.hbs
View File

@ -29,7 +29,7 @@
{{else}} {{else}}
<label>{{i18n 'admin.email.send_digest_label'}}</label> <label>{{i18n 'admin.email.send_digest_label'}}</label>
{{text-field value=email placeholderKey="admin.email.test_email_address"}} {{text-field value=email placeholderKey="admin.email.test_email_address"}}
<button class='btn' {{action "sendEmail"}} disabled={{sendEmailDisabled}}>{{i18n 'admin.email.send_digest'}}</button> <button class='btn btn-default' {{action "sendEmail"}} disabled={{sendEmailDisabled}}>{{i18n 'admin.email.send_digest'}}</button>
{{#if sentEmail}} {{#if sentEmail}}
<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span> <span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>
{{/if}} {{/if}}

2
app/assets/javascripts/admin/templates/logs/screened-emails.hbs
View File

@ -1,7 +1,7 @@
<p> <p>
{{i18n 'admin.logs.screened_emails.description'}} {{i18n 'admin.logs.screened_emails.description'}}
</p> </p>
<button class="btn screened-email-export" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button> <button class="btn btn-default screened-email-export" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
<br> <br>

14
app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
View File

@ -3,8 +3,8 @@
<div class="screened-ip-controls"> <div class="screened-ip-controls">
<div class="filter-screened-ip-address"> <div class="filter-screened-ip-address">
{{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}} {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
{{d-button action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}} {{d-button class="btn-default" action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
{{d-button action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}} {{d-button class="btn-default" action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
</div> </div>
{{screened-ip-address-form action="recordAdded"}} {{screened-ip-address-form action="recordAdded"}}
</div> </div>
@ -57,15 +57,15 @@
</td> </td>
<td class="col actions"> <td class="col actions">
{{#unless item.editing}} {{#unless item.editing}}
{{d-button action="destroy" actionParam=item icon="trash-o" class="btn-danger"}} {{d-button class="btn-default" action="destroy" actionParam=item icon="trash-o" class="btn-danger"}}
{{d-button action="edit" actionParam=item icon="pencil"}} {{d-button class="btn-default"action="edit" actionParam=item icon="pencil"}}
{{#if item.isBlocked}} {{#if item.isBlocked}}
{{d-button action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}} {{d-button class="btn-default" action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
{{else}} {{else}}
{{d-button action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}} {{d-button class="btn-default" action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}}
{{/if}} {{/if}}
{{else}} {{else}}
{{d-button action="save" actionParam=item label="admin.logs.save"}} {{d-button class="btn-default" action="save" actionParam=item label="admin.logs.save"}}
<a {{action "cancel" item}}>{{i18n 'cancel'}}</a> <a {{action "cancel" item}}>{{i18n 'cancel'}}</a>
{{/unless}} {{/unless}}
</td> </td>

2
app/assets/javascripts/admin/templates/logs/screened-urls.hbs
View File

@ -1,7 +1,7 @@
<p> <p>
{{i18n 'admin.logs.screened_urls.description'}} {{i18n 'admin.logs.screened_urls.description'}}
</p> </p>
<button class="btn" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button> <button class="btn btn-default" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
<br> <br>
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}

2
app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
View File

@ -33,7 +33,7 @@
{{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}} {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
{{/if}} {{/if}}
{{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}} {{d-button class="btn-default" action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

2
app/assets/javascripts/admin/templates/plugins-index.hbs
View File

@ -49,7 +49,7 @@
<td class="settings"> <td class="settings">
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{#if plugin.enabled_setting}} {{#if plugin.enabled_setting}}
{{d-button action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}} {{d-button class="btn-default" action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</td> </td>

2
app/assets/javascripts/admin/templates/plugins.hbs
View File

@ -6,7 +6,7 @@
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button label="admin.plugins.change_settings" {{d-button label="admin.plugins.change_settings"
icon="gear" icon="gear"
class='settings-button' class="btn-default settings-button"
action="showSettings"}} action="showSettings"}}
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/admin/templates/site-settings.hbs
View File

@ -3,7 +3,7 @@
<div class='controls'> <div class='controls'>
{{d-button action="toggleMenu" class="menu-toggle" icon="bars"}} {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
{{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}} {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
{{d-button id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}} {{d-button class="btn-default" id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}}
</div> </div>
<div class='search controls'> <div class='search controls'>
<label> <label>

59
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -1,18 +1,18 @@
<section class="details {{unless model.active 'not-activated'}}"> <section class="details {{unless model.active 'not-activated'}}">
<div class='user-controls'> <div class='user-controls'>
{{#if model.canViewProfile}} {{#if model.canViewProfile}}
{{#link-to 'user' model class="btn"}} {{#link-to 'user' model class="btn btn-default"}}
{{d-icon "user"}} {{d-icon "user"}}
{{i18n 'admin.user.show_public_profile'}} {{i18n 'admin.user.show_public_profile'}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
{{#if model.can_view_action_logs}} {{#if model.can_view_action_logs}}
{{d-button action="viewActionLogs" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}} {{d-button action="viewActionLogs" class="btn-default" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}}
{{/if}} {{/if}}
{{#if model.active}} {{#if model.active}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button action="logOut" icon="power-off" label="admin.user.log_out"}} {{d-button class="btn-default" action="logOut" icon="power-off" label="admin.user.log_out"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{plugin-outlet name="admin-user-controls-after" args=(hash model=model) tagName="" connectorTagName=""}} {{plugin-outlet name="admin-user-controls-after" args=(hash model=model) tagName="" connectorTagName=""}}
@ -29,10 +29,10 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{#if editingUsername}} {{#if editingUsername}}
{{d-button action="saveUsername" label="admin.user_fields.save"}} {{d-button class="btn-default" action="saveUsername" label="admin.user_fields.save"}}
<a href {{action "toggleUsernameEdit"}}>{{i18n 'cancel'}}</a> <a href {{action "toggleUsernameEdit"}}>{{i18n 'cancel'}}</a>
{{else}} {{else}}
{{d-button action="toggleUsernameEdit" icon="pencil"}} {{d-button class="btn-default" action="toggleUsernameEdit" icon="pencil"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -48,10 +48,10 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{#if editingName}} {{#if editingName}}
{{d-button action="saveName" label="admin.user_fields.save"}} {{d-button class="btn-default" action="saveName" label="admin.user_fields.save"}}
<a href {{action "toggleNameEdit"}}>{{i18n 'cancel'}}</a> <a href {{action "toggleNameEdit"}}>{{i18n 'cancel'}}</a>
{{else}} {{else}}
{{d-button action="toggleNameEdit" icon="pencil"}} {{d-button class="btn-default" action="toggleNameEdit" icon="pencil"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -68,7 +68,7 @@
{{#if model.email}} {{#if model.email}}
<a href="mailto:{{unbound model.email}}">{{model.email}}</a> <a href="mailto:{{unbound model.email}}">{{model.email}}</a>
{{else}} {{else}}
{{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} {{d-button class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -89,6 +89,7 @@
{{/if}} {{/if}}
{{else}} {{else}}
{{d-button action="checkEmail" {{d-button action="checkEmail"
class="btn-default"
actionParam=model actionParam=model
icon="envelope-o" icon="envelope-o"
label="admin.users.check_email.text" label="admin.users.check_email.text"
@ -102,7 +103,7 @@
<div class='value'>{{model.bounceScore}}</div> <div class='value'>{{model.bounceScore}}</div>
<div class='controls'> <div class='controls'>
{{#if model.canResetBounceScore}} {{#if model.canResetBounceScore}}
{{d-button action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}} {{d-button class="btn-default" action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}}
{{/if}} {{/if}}
{{model.bounceScoreExplanation}} {{model.bounceScoreExplanation}}
</div> </div>
@ -114,7 +115,7 @@
{{#if associatedAccountsLoaded}} {{#if associatedAccountsLoaded}}
{{associatedAccounts}} {{associatedAccounts}}
{{else}} {{else}}
{{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}} {{d-button class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -139,10 +140,10 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{#if editingTitle}} {{#if editingTitle}}
{{d-button action="saveTitle" label="admin.user_fields.save"}} {{d-button class="btn-default" action="saveTitle" label="admin.user_fields.save"}}
<a href {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a> <a href {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a>
{{else}} {{else}}
{{d-button action="toggleTitleEdit" icon="pencil"}} {{d-button class="btn-default" action="toggleTitleEdit" icon="pencil"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -152,7 +153,7 @@
<div class='value'>{{model.ip_address}}</div> <div class='value'>{{model.ip_address}}</div>
<div class='controls'> <div class='controls'>
{{#if currentUser.staff}} {{#if currentUser.staff}}
{{d-button action="refreshBrowsers" label="admin.user.refresh_browsers"}} {{d-button class="btn-default" action="refreshBrowsers" label="admin.user.refresh_browsers"}}
{{ip-lookup ip=model.ip_address userId=model.id}} {{ip-lookup ip=model.ip_address userId=model.id}}
{{/if}} {{/if}}
</div> </div>
@ -191,7 +192,7 @@
</div> </div>
<div class='controls'> <div class='controls'>
{{#if canDisableSecondFactor}} {{#if canDisableSecondFactor}}
{{d-button action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}} {{d-button class="btn-default" action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -236,7 +237,7 @@
{{i18n 'admin.user.approve_success'}} {{i18n 'admin.user.approve_success'}}
{{else}} {{else}}
{{#if model.can_approve}} {{#if model.can_approve}}
{{d-button action="approve" icon="check" label="admin.user.approve"}} {{d-button class="btn-default" action="approve" icon="check" label="admin.user.approve"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
@ -249,15 +250,15 @@
<div class='controls'> <div class='controls'>
{{#if model.active}} {{#if model.active}}
{{#if model.can_deactivate}} {{#if model.can_deactivate}}
{{d-button action="deactivate" label="admin.user.deactivate_account"}} {{d-button class="btn-default" action="deactivate" label="admin.user.deactivate_account"}}
{{i18n 'admin.user.deactivate_explanation'}} {{i18n 'admin.user.deactivate_explanation'}}
{{/if}} {{/if}}
{{else}} {{else}}
{{#if model.can_send_activation_email}} {{#if model.can_send_activation_email}}
{{d-button action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}} {{d-button class="btn-default" action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}}
{{/if}} {{/if}}
{{#if model.can_activate}} {{#if model.can_activate}}
{{d-button action="activate" icon="check" label="admin.user.activate"}} {{d-button class="btn-default" action="activate" icon="check" label="admin.user.activate"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
@ -275,15 +276,15 @@
{{#if model.api_key}} {{#if model.api_key}}
<div class='long-value'> <div class='long-value'>
{{model.api_key.key}} {{model.api_key.key}}
{{d-button action="regenerateApiKey" icon="undo" label="admin.api.regenerate"}} {{d-button class="btn-default" action="regenerateApiKey" icon="undo" label="admin.api.regenerate"}}
{{d-button action="revokeApiKey" icon="times" label="admin.api.revoke"}} {{d-button class="btn-default" action="revokeApiKey" icon="times" label="admin.api.revoke"}}
</div> </div>
{{else}} {{else}}
<div class='value'> <div class='value'>
&mdash; &mdash;
</div> </div>
<div class='controls'> <div class='controls'>
{{d-button action="generateApiKey" icon="key" label="admin.api.generate"}} {{d-button class="btn-default" action="generateApiKey" icon="key" label="admin.api.generate"}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -294,10 +295,10 @@
<div class='value'>{{i18n-yes-no model.admin}}</div> <div class='value'>{{i18n-yes-no model.admin}}</div>
<div class='controls'> <div class='controls'>
{{#if model.can_revoke_admin}} {{#if model.can_revoke_admin}}
{{d-button action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}} {{d-button class="btn-default" action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}}
{{/if}} {{/if}}
{{#if model.can_grant_admin}} {{#if model.can_grant_admin}}
{{d-button action="grantAdmin" icon="shield" label="admin.user.grant_admin"}} {{d-button class="btn-default" action="grantAdmin" icon="shield" label="admin.user.grant_admin"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -307,10 +308,10 @@
<div class='value'>{{i18n-yes-no model.moderator}}</div> <div class='value'>{{i18n-yes-no model.moderator}}</div>
<div class='controls'> <div class='controls'>
{{#if model.can_revoke_moderation}} {{#if model.can_revoke_moderation}}
{{d-button action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}} {{d-button class="btn-default" action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}}
{{/if}} {{/if}}
{{#if model.can_grant_moderation}} {{#if model.can_grant_moderation}}
{{d-button action="grantModeration" icon="shield" label="admin.user.grant_moderation"}} {{d-button class="btn-default" action="grantModeration" icon="shield" label="admin.user.grant_moderation"}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -330,14 +331,14 @@
{{#if model.canLockTrustLevel}} {{#if model.canLockTrustLevel}}
{{#if hasLockedTrustLevel}} {{#if hasLockedTrustLevel}}
{{d-icon "lock" title="admin.user.trust_level_locked_tip"}} {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
{{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}} {{d-button class="btn-default" action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
{{else}} {{else}}
{{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}} {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}}
{{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}} {{d-button class="btn-default" action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if model.tl3Requirements}} {{#if model.tl3Requirements}}
{{#link-to 'adminUser.tl3Requirements' model class="btn"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}} {{#link-to 'adminUser.tl3Requirements' model class="btn btn-default"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}}
{{/if}} {{/if}}
</div> </div>
</div> </div>
@ -439,6 +440,7 @@
{{#if currentUser.admin}} {{#if currentUser.admin}}
<div class='controls'> <div class='controls'>
{{d-button label="admin.user.clear_penalty_history.title" {{d-button label="admin.user.clear_penalty_history.title"
class="btn-default"
icon="times" icon="times"
action=(action "clearPenaltyHistory")}} action=(action "clearPenaltyHistory")}}
{{i18n "admin.user.clear_penalty_history.description"}} {{i18n "admin.user.clear_penalty_history.description"}}
@ -537,6 +539,7 @@
<div class='controls'> <div class='controls'>
{{#if model.flags_received_count}} {{#if model.flags_received_count}}
{{d-button {{d-button
class="btn-default"
action=(action "showFlagsReceived") action=(action "showFlagsReceived")
label="admin.user.show_flags_received" label="admin.user.show_flags_received"
icon="flag" icon="flag"

2
app/assets/javascripts/admin/templates/users-list-show.hbs
View File

@ -8,7 +8,7 @@
<div class="admin-title"> <div class="admin-title">
<h2>{{title}}</h2> <h2>{{title}}</h2>
{{#unless showEmails}} {{#unless showEmails}}
<button {{action "showEmails"}} class="show-emails btn">{{i18n 'admin.users.show_emails'}}</button> <button {{action "showEmails"}} class="show-emails btn btn-default">{{i18n 'admin.users.show_emails'}}</button>
{{/unless}} {{/unless}}
</div> </div>
<div class='username controls'> <div class='username controls'>

4
app/assets/javascripts/admin/templates/users-list.hbs
View File

@ -14,10 +14,10 @@
{{nav-item route='groups' label='groups.index.title'}} {{nav-item route='groups' label='groups.index.title'}}
<div class="admin-actions"> <div class="admin-actions">
{{#unless siteSettings.enable_sso}} {{#unless siteSettings.enable_sso}}
{{d-button action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}} {{d-button class="btn-default" action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
{{/unless}} {{/unless}}
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}} {{d-button class="btn-default" action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
{{/if}} {{/if}}
</div> </div>
</ul> </ul>

2
app/assets/javascripts/admin/templates/web-hooks.hbs
View File

@ -2,7 +2,7 @@
<div class='web-hooks-listing'> <div class='web-hooks-listing'>
<p>{{i18n 'admin.web_hooks.instruction'}}</p> <p>{{i18n 'admin.web_hooks.instruction'}}</p>
<div class='new-webhook'> <div class='new-webhook'>
{{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}} {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn btn-default'}}
{{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}} {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
{{/link-to}} {{/link-to}}
</div> </div>

2
app/assets/javascripts/discourse/components/share-button.js.es6
View File

@ -1,7 +1,7 @@
import Button from "discourse/components/d-button"; import Button from "discourse/components/d-button";
export default Button.extend({ export default Button.extend({
classNames: ["share"], classNames: ["btn-default", "share"],
icon: "link", icon: "link",
title: "topic.share.help", title: "topic.share.help",
label: "topic.share.title", label: "topic.share.title",

37
app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
View File

@ -21,24 +21,45 @@ function addBulkButton(action, key, opts) {
} }
// Default buttons // Default buttons
addBulkButton("showChangeCategory", "change_category", { icon: "pencil" }); addBulkButton("showChangeCategory", "change_category", {
addBulkButton("closeTopics", "close_topics", { icon: "lock" }); icon: "pencil",
addBulkButton("archiveTopics", "archive_topics", { icon: "folder" }); class: "btn-default"
addBulkButton("showNotificationLevel", "notification_level", { });
icon: "d-regular" addBulkButton("closeTopics", "close_topics", {
icon: "lock",
class: "btn-default"
});
addBulkButton("archiveTopics", "archive_topics", {
icon: "folder",
class: "btn-default"
});
addBulkButton("showNotificationLevel", "notification_level", {
icon: "d-regular",
class: "btn-default"
});
addBulkButton("resetRead", "reset_read", {
icon: "backward",
class: "btn-default"
}); });
addBulkButton("resetRead", "reset_read", { icon: "backward" });
addBulkButton("unlistTopics", "unlist_topics", { addBulkButton("unlistTopics", "unlist_topics", {
icon: "eye-slash", icon: "eye-slash",
class: "btn-default",
buttonVisible: topics => topics.some(t => t.visible) buttonVisible: topics => topics.some(t => t.visible)
}); });
addBulkButton("relistTopics", "relist_topics", { addBulkButton("relistTopics", "relist_topics", {
icon: "eye", icon: "eye",
class: "btn-default",
buttonVisible: topics => topics.some(t => !t.visible) buttonVisible: topics => topics.some(t => !t.visible)
}); });
if (Discourse.SiteSettings.tagging_enabled) { if (Discourse.SiteSettings.tagging_enabled) {
addBulkButton("showTagTopics", "change_tags", { icon: "tag" }); addBulkButton("showTagTopics", "change_tags", {
addBulkButton("showAppendTagTopics", "append_tags", { icon: "tag" }); icon: "tag",
class: "btn-default"
});
addBulkButton("showAppendTagTopics", "append_tags", {
icon: "tag",
class: "btn-default"
});
} }
addBulkButton("deleteTopics", "delete", { icon: "trash", class: "btn-danger" }); addBulkButton("deleteTopics", "delete", { icon: "trash", class: "btn-danger" });

2
app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
View File

@ -1,5 +1,5 @@
{{#if selected}} {{#if selected}}
<div id='bulk-select'> <div id='bulk-select'>
{{d-button action="showBulkActions" icon="wrench"}} {{d-button class="btn-default" action="showBulkActions" icon="wrench"}}
</div> </div>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/components/categories-topic-list.hbs
View File

@ -7,7 +7,7 @@
{{latest-topic-list-item topic=t}} {{latest-topic-list-item topic=t}}
{{/each}} {{/each}}
<div class="more-topics"> <div class="more-topics">
<a href="/{{filter}}" class="btn pull-right">{{i18n "more"}}</a> <a href="/{{filter}}" class="btn btn-default pull-right">{{i18n "more"}}</a>
</div> </div>
{{else}} {{else}}
<div class='no-topics'> <div class='no-topics'>

8
app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
View File

@ -1,15 +1,15 @@
{{#if isNotSupported}} {{#if isNotSupported}}
{{d-button icon="bell-slash" label="user.desktop_notifications.not_supported" disabled="true"}} {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}}
{{/if}} {{/if}}
{{#if isDeniedPermission}} {{#if isDeniedPermission}}
{{d-button icon="bell-slash" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}} {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}}
{{i18n "user.desktop_notifications.perm_denied_expl"}} {{i18n "user.desktop_notifications.perm_denied_expl"}}
{{else}} {{else}}
{{#if isEnabled}} {{#if isEnabled}}
{{d-button icon="bell-slash-o" label="user.desktop_notifications.disable" action="turnoff"}} {{d-button icon="bell-slash-o" class="btn-default" label="user.desktop_notifications.disable" action="turnoff"}}
{{i18n "user.desktop_notifications.currently_enabled"}} {{i18n "user.desktop_notifications.currently_enabled"}}
{{else}} {{else}}
{{d-button icon="bell-o" label="user.desktop_notifications.enable" action="turnon"}} {{d-button icon="bell-o" class="btn-default" label="user.desktop_notifications.enable" action="turnon"}}
{{i18n "user.desktop_notifications.currently_disabled"}} {{i18n "user.desktop_notifications.currently_disabled"}}
{{/if}} {{/if}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
View File

@ -32,7 +32,7 @@
{{/if}} {{/if}}
{{else}} {{else}}
{{#unless category.is_special}} {{#unless category.is_special}}
<button {{action "editPermissions"}} class="btn btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button> <button {{action "editPermissions"}} class="btn btn-default btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button>
{{/unless}} {{/unless}}
{{/if}} {{/if}}
</section> </section>

2
app/assets/javascripts/discourse/templates/components/image-uploader.hbs
View File

@ -1,6 +1,6 @@
<div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}> <div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
<div class="image-upload-controls"> <div class="image-upload-controls">
<label class="btn pad-left no-text {{if uploading 'disabled'}}"> <label class="btn btn-default pad-left no-text {{if uploading 'disabled'}}">
{{d-icon "picture-o"}} {{d-icon "picture-o"}}
<input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" /> <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" />
</label> </label>

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

@ -1,5 +1,5 @@
{{#if ip}} {{#if ip}}
<button class="btn" {{action "lookup"}}> <button class="btn btn-default" {{action "lookup"}}>
{{d-icon "globe"}}{{i18n 'admin.user.ip_lookup'}} {{d-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
</button> </button>
{{/if}} {{/if}}
@ -7,9 +7,9 @@
<div class="location-box"> <div class="location-box">
<a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a> <a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
{{#if copied}} {{#if copied}}
<a class="btn btn-hover pull-right">{{d-icon "copy"}} {{i18n "ip_lookup.copied"}}</a> <a class="btn btn-default btn-hover pull-right">{{d-icon "copy"}} {{i18n "ip_lookup.copied"}}</a>
{{else}} {{else}}
<a class="btn pull-right no-text" {{action "copy"}}>{{d-icon "copy"}}</a> <a class="btn btn-default pull-right no-text" {{action "copy"}}>{{d-icon "copy"}}</a>
{{/if}} {{/if}}
<h4>{{i18n 'ip_lookup.title'}}</h4> <h4>{{i18n 'ip_lookup.title'}}</h4>
<p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p> <p class='powered-by'>{{{i18n 'ip_lookup.powered_by'}}}</p>

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

@ -1,5 +1,5 @@
{{#each periods as |p|}} {{#each periods as |p|}}
{{#d-button action="changePeriod" actionParam=p}} {{#d-button action="changePeriod" class="btn-default" actionParam=p}}
{{period-title p}} {{period-title p}}
{{/d-button}} {{/d-button}}
{{/each}} {{/each}}

10
app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
View File

@ -24,7 +24,7 @@
showInvite=showInvite showInvite=showInvite
showFlagTopic=showFlagTopic}} showFlagTopic=showFlagTopic}}
{{else}} {{else}}
{{d-button class=bookmarkClass {{d-button class="btn-default {{bookmarkClass}}"
title=bookmarkTitle title=bookmarkTitle
label=bookmarkLabel label=bookmarkLabel
icon="bookmark" icon="bookmark"
@ -33,7 +33,7 @@
{{share-button url=topic.shareUrl}} {{share-button url=topic.shareUrl}}
{{#if topic.details.can_flag_topic}} {{#if topic.details.can_flag_topic}}
{{d-button class="flag-topic" {{d-button class="btn-default flag-topic"
title="topic.flag_topic.help" title="topic.flag_topic.help"
label="topic.flag_topic.title" label="topic.flag_topic.title"
icon="flag" icon="flag"
@ -44,7 +44,7 @@
{{/unless}} {{/unless}}
{{#if canInviteTo}} {{#if canInviteTo}}
{{d-button class="invite-topic" {{d-button class="btn-default invite-topic"
title="topic.invite_reply.help" title="topic.invite_reply.help"
label="topic.invite_reply.title" label="topic.invite_reply.title"
icon="users" icon="users"
@ -53,7 +53,7 @@
{{/if}} {{/if}}
{{#if canArchive}} {{#if canArchive}}
{{d-button class="standard archive-topic" {{d-button class="btn-default standard archive-topic"
title=archiveTitle title=archiveTitle
label=archiveLabel label=archiveLabel
icon=archiveIcon icon=archiveIcon
@ -61,7 +61,7 @@
{{/if}} {{/if}}
{{#if showEditOnFooter}} {{#if showEditOnFooter}}
{{d-button class="edit-message" {{d-button class="btn-default edit-message"
title="topic.edit_message.help" title="topic.edit_message.help"
label="topic.edit_message.title" label="topic.edit_message.title"
icon="pencil" icon="pencil"

1
app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
View File

@ -53,6 +53,7 @@
{{#if showFilter}} {{#if showFilter}}
<li> <li>
{{d-button {{d-button
class="btn-default"
action=(action "togglePosts" user) action=(action "togglePosts" user)
icon="filter" icon="filter"
translatedLabel=togglePostsLabel}} translatedLabel=togglePostsLabel}}

4
app/assets/javascripts/discourse/templates/components/user-stream-item.hbs
View File

@ -61,7 +61,7 @@
{{#if item.editableDraft}} {{#if item.editableDraft}}
<div class='user-stream-item-draft-actions'> <div class='user-stream-item-draft-actions'>
{{d-button action=resumeDraft actionParam=item icon="pencil" label='drafts.resume' class="resume-draft"}} {{d-button action=resumeDraft actionParam=item icon="pencil" label='drafts.resume' class="btn-default resume-draft"}}
{{d-button action=removeDraft actionParam=item icon="times" label='drafts.remove' class="remove-draft"}} {{d-button action=removeDraft actionParam=item icon="trash-o" label='drafts.remove' class="btn-default remove-draft"}}
</div> </div>
{{/if}} {{/if}}

8
app/assets/javascripts/discourse/templates/discovery/topics.hbs
View File

@ -5,10 +5,10 @@
{{#if showDismissAtTop}} {{#if showDismissAtTop}}
<div class="row"> <div class="row">
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button> <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics-top' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button> <button id='dismiss-new-top' class='btn btn-default dismiss-read' {{action "resetNew"}}>{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
@ -69,10 +69,10 @@
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button> <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}> <button id='dismiss-new' class='btn btn-default dismiss-read' {{action "resetNew"}}>
{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button> {{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/full-page-search.hbs
View File

@ -34,7 +34,7 @@
{{/if}} {{/if}}
{{#if canBulkSelect}} {{#if canBulkSelect}}
{{d-button icon="list" class="bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}} {{d-button icon="list" class="btn-default bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
{{bulk-select-button selected=selected action="search"}} {{bulk-select-button selected=selected action="search"}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/groups/index.hbs
View File

@ -2,7 +2,7 @@
<div class="groups-header"> <div class="groups-header">
{{#if currentUser.admin}} {{#if currentUser.admin}}
{{d-button action="new" {{d-button action="new"
class="groups-header-new pull-right" class="btn-default groups-header-new pull-right"
icon="plus" icon="plus"
label="admin.groups.new.title"}} label="admin.groups.new.title"}}
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/mobile/components/categories-only.hbs
View File

@ -49,7 +49,7 @@
{{/if}} {{/if}}
{{#if c.can_edit}} {{#if c.can_edit}}
<a href {{action "editCategory" c}} class='btn btn-small'>{{i18n 'category.edit'}}</a> <a href {{action "editCategory" c}} class='btn btn-default btn-small'>{{i18n 'category.edit'}}</a>
{{/if}} {{/if}}
</footer> </footer>

4
app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
View File

@ -30,10 +30,10 @@
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{#if allLoaded}} {{#if allLoaded}}
{{#if showDismissRead}} {{#if showDismissRead}}
<button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button> <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn btn-default dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
{{/if}} {{/if}}
{{#if showResetNew}} {{#if showResetNew}}
<button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}> <button id='dismiss-new' class='btn btn-default dismiss-read' {{action "resetNew"}}>
{{d-icon "check"}} {{d-icon "check"}}
{{i18n 'topics.bulk.dismiss_new'}}</button> {{i18n 'topics.bulk.dismiss_new'}}</button>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
View File

@ -20,7 +20,7 @@
title="user.change_avatar.refresh_gravatar_title" title="user.change_avatar.refresh_gravatar_title"
disabled=gravatarRefreshDisabled disabled=gravatarRefreshDisabled
icon="refresh" icon="refresh"
class="avatar-selector-refresh-gravatar"}} class="btn-default avatar-selector-refresh-gravatar"}}
{{#if gravatarFailed}} {{#if gravatarFailed}}
<p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p> <p class="error">{{I18n 'user.change_avatar.gravatar_failed'}}</p>

2
app/assets/javascripts/discourse/templates/modal/edit-category.hbs
View File

@ -30,7 +30,7 @@
{{else if model.id}} {{else if model.id}}
<div class="disable_info_wrap"> <div class="disable_info_wrap">
{{d-button disabled=deleteDisabled {{d-button disabled=deleteDisabled
class="disable-no-hover" class="btn-default disable-no-hover"
action="toggleDeleteTooltip" action="toggleDeleteTooltip"
icon="question-circle" icon="question-circle"
label="category.delete"}} label="category.delete"}}

12
app/assets/javascripts/discourse/templates/modal/history.hbs
View File

@ -1,19 +1,20 @@
{{#d-modal-body title="history" maxHeight="70%"}} {{#d-modal-body title="history" maxHeight="70%"}}
<div id="revision"> <div id="revision">
<div id="revision-controls"> <div id="revision-controls">
{{d-button action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}} {{d-button class="btn-default" action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
{{d-button action="loadPreviousVersion" icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}} {{d-button class="btn-default" action="loadPreviousVersion" icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
<div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}"> <div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}">
{{#conditional-loading-spinner condition=loading size="small"}} {{#conditional-loading-spinner condition=loading size="small"}}
{{{revisionsText}}} {{{revisionsText}}}
{{/conditional-loading-spinner}} {{/conditional-loading-spinner}}
</div> </div>
{{d-button action="loadNextVersion" icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}} {{d-button class="btn-default" action="loadNextVersion" icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
{{d-button action="loadLastVersion" icon="fast-forward" title="post.revisions.controls.last" disabled=loadLastDisabled}} {{d-button class="btn-default" action="loadLastVersion" icon="fast-forward" title="post.revisions.controls.last" disabled=loadLastDisabled}}
</div> </div>
{{#if displayEdit}} {{#if displayEdit}}
{{d-button action="editPost" {{d-button action="editPost"
class="btn-default"
icon="pencil" icon="pencil"
label=editButtonLabel}} label=editButtonLabel}}
{{/if}} {{/if}}
@ -131,12 +132,13 @@
{{/if}} {{/if}}
{{#if displayShow}} {{#if displayShow}}
{{d-button action="showVersion" icon="eye" label="post.revisions.controls.show" disabled=loading}} {{d-button action="showVersion" icon="eye" label="post.revisions.controls.show" class="btn-default" disabled=loading}}
{{/if}} {{/if}}
{{#if displayEdit}} {{#if displayEdit}}
{{d-button action="editPost" {{d-button action="editPost"
icon="pencil" icon="pencil"
class="btn-default"
label=editButtonLabel}} label=editButtonLabel}}
{{/if}} {{/if}}
</div> </div>

4
app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
View File

@ -9,8 +9,8 @@
<tr data-category-id="{{cat.id}}"> <tr data-category-id="{{cat.id}}">
<td> <td>
{{number-field number=cat.position}} {{number-field number=cat.position}}
{{d-button class="no-text" action="moveUp" actionParam=cat icon="arrow-up"}} {{d-button class="btn-default no-text" action="moveUp" actionParam=cat icon="arrow-up"}}
{{d-button class="no-text" action="moveDown" actionParam=cat icon="arrow-down"}} {{d-button class="btn-default no-text" action="moveDown" actionParam=cat icon="arrow-down"}}
{{#if cat.hasBufferedChanges}} {{#if cat.hasBufferedChanges}}
{{d-button class="no-text ok" action="commit" icon="check"}} {{d-button class="no-text ok" action="commit" icon="check"}}
{{/if}} {{/if}}

14
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -3,7 +3,7 @@
<div class="controls"> <div class="controls">
<span class='static'>{{model.username}}</span> <span class='static'>{{model.username}}</span>
{{#if model.can_edit_username}} {{#if model.can_edit_username}}
{{#link-to "preferences.username" class="btn btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.username" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{/link-to}} {{d-icon "pencil"}} {{/link-to}}
{{/if}} {{/if}}
</div> </div>
@ -37,7 +37,7 @@
<div class="controls"> <div class="controls">
<span class='static'>{{model.email}}</span> <span class='static'>{{model.email}}</span>
{{#if model.can_edit_email}} {{#if model.can_edit_email}}
{{#link-to "preferences.email" class="btn btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}} {{#link-to "preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>
@ -45,7 +45,7 @@
</div> </div>
{{else}} {{else}}
<div class="controls"> <div class="controls">
{{d-button action="checkEmail" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}} {{d-button action="checkEmail" class="btn-default" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -55,7 +55,7 @@
<div class="control-group pref-password"> <div class="control-group pref-password">
<label class="control-label">{{i18n 'user.password.title'}}</label> <label class="control-label">{{i18n 'user.password.title'}}</label>
<div class="controls"> <div class="controls">
<a href {{action "changePassword"}} class='btn'> <a href {{action "changePassword"}} class='btn btn-default'>
{{d-icon "envelope"}} {{d-icon "envelope"}}
{{#if model.no_password}} {{#if model.no_password}}
{{i18n 'user.change_password.set_password'}} {{i18n 'user.change_password.set_password'}}
@ -75,7 +75,7 @@
{{/if}} {{/if}}
{{#if isCurrentUser}} {{#if isCurrentUser}}
{{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.second-factor" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{d-icon "pencil"}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
@ -90,7 +90,7 @@
{{/if}} {{/if}}
{{#if isCurrentUser}} {{#if isCurrentUser}}
{{#link-to "preferences.second-factor-backup" class="btn btn-small btn-icon pad-left no-text"}} {{#link-to "preferences.second-factor-backup" class="btn btn-default btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}} {{d-icon "pencil"}}
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}
@ -144,7 +144,7 @@
<div class="controls"> <div class="controls">
{{! we want the "huge" version even though we're downsizing it in CSS }} {{! we want the "huge" version even though we're downsizing it in CSS }}
{{bound-avatar model "huge"}} {{bound-avatar model "huge"}}
{{d-button action="showAvatarSelector" actionParam=model class="pad-left" icon="pencil"}} {{d-button action="showAvatarSelector" actionParam=model class="btn-default pad-left" icon="pencil"}}
</div> </div>
</div> </div>
{{/unless}} {{/unless}}

2
app/assets/javascripts/discourse/templates/queued-posts.hbs
View File

@ -6,6 +6,6 @@
<p>{{i18n "queue.none"}}</p> <p>{{i18n "queue.none"}}</p>
{{/each}} {{/each}}
{{d-button action="refresh" label="refresh" icon="refresh" disabled=model.refreshing id='refresh-queued'}} {{d-button action="refresh" label="refresh" icon="refresh" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
</div> </div>
</div> </div>

2
app/assets/javascripts/discourse/templates/tag-groups-show.hbs
View File

@ -43,7 +43,7 @@
</div> </div>
</section> </section>
<button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'tagging.groups.save'}}</button> <button {{action "save"}} disabled={{model.disableSave}} class='btn btn-default'>{{i18n 'tagging.groups.save'}}</button>
<button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button> <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
<span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span> <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
</div> </div>

2
app/assets/javascripts/discourse/templates/tag-groups.hbs
View File

@ -7,7 +7,7 @@
<li><a {{action "selectTagGroup" tagGroup}} class="{{if tagGroup.selected 'active'}}">{{tagGroup.name}}</a></li> <li><a {{action "selectTagGroup" tagGroup}} class="{{if tagGroup.selected 'active'}}">{{tagGroup.name}}</a></li>
{{/each}} {{/each}}
</ul> </ul>
<button {{action "newTagGroup"}} class='btn'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button> <button {{action "newTagGroup"}} class='btn btn-default'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
</div> </div>
{{outlet}} {{outlet}}

4
app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
View File

@ -5,8 +5,8 @@
{{/if ~}} {{/if ~}}
{{~#if bulkSelectEnabled}} {{~#if bulkSelectEnabled}}
<span class='bulk-select-topics'> <span class='bulk-select-topics'>
<button class='btn bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button> <button class='btn btn-default bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button>
<button class='btn bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button> <button class='btn btn-default bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button>
</span> </span>
{{/if ~}} {{/if ~}}
{{/if ~}} {{/if ~}}

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

@ -32,7 +32,7 @@
{{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}} {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
<div class="edit-controls"> <div class="edit-controls">
{{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
{{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} {{d-button action="cancelEditingTopic" class="btn-default btn-small cancel-edit" icon="times"}}
{{#if canRemoveTopicFeaturedLink}} {{#if canRemoveTopicFeaturedLink}}
<a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}"> <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">

6
app/assets/javascripts/discourse/templates/user.hbs
View File

@ -51,7 +51,7 @@
</li> </li>
{{/if}} {{/if}}
{{#if currentUser.staff}} {{#if currentUser.staff}}
<li><a href={{model.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li> <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
{{/if}} {{/if}}
{{plugin-outlet name="user-profile-controls" {{plugin-outlet name="user-profile-controls"
connectorTagName="li" connectorTagName="li"
@ -60,11 +60,11 @@
{{#if canExpandProfile}} {{#if canExpandProfile}}
<li> <li>
{{#if collapsedInfo}} {{#if collapsedInfo}}
<a {{action "expandProfile"}} href class="btn"> <a {{action "expandProfile"}} href class="btn btn-default">
{{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}} {{d-icon "angle-double-down"}} {{i18n 'user.expand_profile'}}
</a> </a>
{{else}} {{else}}
<a {{action "collapseProfile"}} href class="btn"> <a {{action "collapseProfile"}} href class="btn btn-default">
{{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}} {{d-icon "angle-double-up"}} {{i18n 'user.collapse_profile'}}
</a> </a>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/user/activity.hbs
View File

@ -29,7 +29,7 @@
{{#if canDownloadPosts}} {{#if canDownloadPosts}}
<div class='user-archive'> <div class='user-archive'>
{{d-button action="exportUserArchive" label="user.download_archive.button_text" icon="download"}} {{d-button action="exportUserArchive" class="btn-default" label="user.download_archive.button_text" icon="download"}}
</div> </div>
{{/if}} {{/if}}
{{/d-section}} {{/d-section}}

8
app/assets/javascripts/discourse/templates/user/messages.hbs
View File

@ -59,7 +59,7 @@
<div class="clearfix list-actions"> <div class="clearfix list-actions">
{{#if showToggleBulkSelect}} {{#if showToggleBulkSelect}}
<button {{action "toggleBulkSelect"}} class="btn bulk-select no-text" title="{{i18n "user.messages.bulk_select"}}"> <button {{action "toggleBulkSelect"}} class="btn btn-default bulk-select no-text" title="{{i18n "user.messages.bulk_select"}}">
{{d-icon "list"}} {{d-icon "list"}}
</button> </button>
{{/if}} {{/if}}
@ -71,19 +71,19 @@
{{/if}} {{/if}}
{{#if canArchive}} {{#if canArchive}}
<button {{action "archive"}} class="btn btn-archive"> <button {{action "archive"}} class="btn btn-default btn-archive">
{{i18n "user.messages.move_to_archive"}} {{i18n "user.messages.move_to_archive"}}
</button> </button>
{{/if}} {{/if}}
{{#if canMoveToInbox}} {{#if canMoveToInbox}}
<button {{action "toInbox"}} class="btn btn-to-inbox"> <button {{action "toInbox"}} class="btn btn-default btn-to-inbox">
{{i18n "user.messages.move_to_inbox"}} {{i18n "user.messages.move_to_inbox"}}
</button> </button>
{{/if}} {{/if}}
{{#if bulkSelectEnabled}} {{#if bulkSelectEnabled}}
<button {{action "selectAll"}} class="btn btn-select-all"> <button {{action "selectAll"}} class="btn btn-default btn-select-all">
{{i18n "user.messages.select_all"}} {{i18n "user.messages.select_all"}}
</button> </button>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/user/notifications.hbs
View File

@ -31,7 +31,7 @@
{{#if model}} {{#if model}}
{{d-button title='user.dismiss_notifications_tooltip' {{d-button title='user.dismiss_notifications_tooltip'
class='btn dismiss-notifications' class='btn btn-default dismiss-notifications'
action=(action "resetNew") action=(action "resetNew")
label='user.dismiss_notifications' label='user.dismiss_notifications'
icon='check' icon='check'

17
app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
View File

@ -22,6 +22,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
if (currentUser.staff) { if (currentUser.staff) {
contents.push({ contents.push({
icon: "list", icon: "list",
className: "btn-default",
label: "admin.flags.moderation_history", label: "admin.flags.moderation_history",
action: "showModerationHistory" action: "showModerationHistory"
}); });
@ -31,7 +32,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
const buttonAtts = { const buttonAtts = {
action: "togglePostType", action: "togglePostType",
icon: "shield", icon: "shield",
className: "toggle-post-type" className: "btn-default toggle-post-type"
}; };
if (attrs.isModeratorAction) { if (attrs.isModeratorAction) {
@ -47,7 +48,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
icon: "cog", icon: "cog",
label: "post.controls.rebake", label: "post.controls.rebake",
action: "rebakePost", action: "rebakePost",
className: "rebuild-html" className: "btn-default rebuild-html"
}); });
if (attrs.hidden) { if (attrs.hidden) {
@ -55,7 +56,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
icon: "eye", icon: "eye",
label: "post.controls.unhide", label: "post.controls.unhide",
action: "unhidePost", action: "unhidePost",
className: "unhide-post" className: "btn-default unhide-post"
}); });
} }
} }
@ -65,7 +66,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
icon: "user", icon: "user",
label: "post.controls.change_owner", label: "post.controls.change_owner",
action: "changePostOwner", action: "changePostOwner",
className: "change-owner" className: "btn-default change-owner"
}); });
} }
@ -75,7 +76,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
icon: "certificate", icon: "certificate",
label: "post.controls.grant_badge", label: "post.controls.grant_badge",
action: "grantBadge", action: "grantBadge",
className: "grant-badge" className: "btn-default grant-badge"
}); });
} }
@ -85,7 +86,7 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
label: `post.controls.${action}_post`, label: `post.controls.${action}_post`,
action: `${action}Post`, action: `${action}Post`,
title: `post.controls.${action}_post_description`, title: `post.controls.${action}_post_description`,
className: `${action}-post` className: `btn-default ${action}-post`
}); });
} }
@ -95,14 +96,14 @@ export function buildManageButtons(attrs, currentUser, siteSettings) {
action: "toggleWiki", action: "toggleWiki",
label: "post.controls.unwiki", label: "post.controls.unwiki",
icon: "pencil-square-o", icon: "pencil-square-o",
className: "wiki wikied" className: "btn-default wiki wikied"
}); });
} else { } else {
contents.push({ contents.push({
action: "toggleWiki", action: "toggleWiki",
label: "post.controls.wiki", label: "post.controls.wiki",
icon: "pencil-square-o", icon: "pencil-square-o",
className: "wiki" className: "btn-default wiki"
}); });
} }
} }

2
app/assets/javascripts/discourse/widgets/private-message-map.js.es6
View File

@ -157,7 +157,7 @@ export default createWidget("private-message-map", {
this.attach("button", { this.attach("button", {
action: "toggleEditing", action: "toggleEditing",
label: "private_message_info.edit", label: "private_message_info.edit",
className: "btn add-remove-participant-btn" className: "btn btn-default add-remove-participant-btn"
}) })
]; ];

15
app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
View File

@ -42,7 +42,8 @@ createWidget("topic-admin-menu-button", {
result.push( result.push(
this.attach("button", { this.attach("button", {
className: className:
"toggle-admin-menu" + (attrs.fixed ? " show-topic-admin" : ""), "btn-default toggle-admin-menu" +
(attrs.fixed ? " show-topic-admin" : ""),
title: "topic_admin_menu", title: "topic_admin_menu",
icon: "wrench", icon: "wrench",
action: "showAdminMenu", action: "showAdminMenu",
@ -132,6 +133,7 @@ export default createWidget("topic-admin-menu", {
const buttons = []; const buttons = [];
buttons.push({ buttons.push({
className: "topic-admin-multi-select", className: "topic-admin-multi-select",
buttonClass: "btn-default",
action: "toggleMultiSelect", action: "toggleMultiSelect",
icon: "tasks", icon: "tasks",
label: "actions.multi_select" label: "actions.multi_select"
@ -153,6 +155,7 @@ export default createWidget("topic-admin-menu", {
if (topic.get("deleted") && details.get("can_recover")) { if (topic.get("deleted") && details.get("can_recover")) {
buttons.push({ buttons.push({
className: "topic-admin-recover", className: "topic-admin-recover",
buttonClass: "btn-default",
action: "recoverTopic", action: "recoverTopic",
icon: "undo", icon: "undo",
label: "actions.recover" label: "actions.recover"
@ -162,6 +165,7 @@ export default createWidget("topic-admin-menu", {
if (topic.get("closed")) { if (topic.get("closed")) {
buttons.push({ buttons.push({
className: "topic-admin-open", className: "topic-admin-open",
buttonClass: "btn-default",
action: "toggleClosed", action: "toggleClosed",
icon: "unlock", icon: "unlock",
label: "actions.open" label: "actions.open"
@ -169,6 +173,7 @@ export default createWidget("topic-admin-menu", {
} else { } else {
buttons.push({ buttons.push({
className: "topic-admin-close", className: "topic-admin-close",
buttonClass: "btn-default",
action: "toggleClosed", action: "toggleClosed",
icon: "lock", icon: "lock",
label: "actions.close" label: "actions.close"
@ -177,6 +182,7 @@ export default createWidget("topic-admin-menu", {
buttons.push({ buttons.push({
className: "topic-admin-status-update", className: "topic-admin-status-update",
buttonClass: "btn-default",
action: "showTopicStatusUpdate", action: "showTopicStatusUpdate",
icon: "clock-o", icon: "clock-o",
label: "actions.timed_update" label: "actions.timed_update"
@ -188,6 +194,7 @@ export default createWidget("topic-admin-menu", {
if (!isPrivateMessage && (topic.get("visible") || featured)) { if (!isPrivateMessage && (topic.get("visible") || featured)) {
buttons.push({ buttons.push({
className: "topic-admin-pin", className: "topic-admin-pin",
buttonClass: "btn-default",
action: "showFeatureTopic", action: "showFeatureTopic",
icon: "thumb-tack", icon: "thumb-tack",
label: featured ? "actions.unpin" : "actions.pin" label: featured ? "actions.unpin" : "actions.pin"
@ -197,6 +204,7 @@ export default createWidget("topic-admin-menu", {
if (this.currentUser.admin) { if (this.currentUser.admin) {
buttons.push({ buttons.push({
className: "topic-admin-change-timestamp", className: "topic-admin-change-timestamp",
buttonClass: "btn-default",
action: "showChangeTimestamp", action: "showChangeTimestamp",
icon: "calendar", icon: "calendar",
label: "change_timestamp.title" label: "change_timestamp.title"
@ -206,6 +214,7 @@ export default createWidget("topic-admin-menu", {
if (this.currentUser.get("staff")) { if (this.currentUser.get("staff")) {
buttons.push({ buttons.push({
className: "topic-admin-reset-bump-date", className: "topic-admin-reset-bump-date",
buttonClass: "btn-default",
action: "resetBumpDate", action: "resetBumpDate",
icon: "anchor", icon: "anchor",
label: "actions.reset_bump_date" label: "actions.reset_bump_date"
@ -215,6 +224,7 @@ export default createWidget("topic-admin-menu", {
if (!isPrivateMessage) { if (!isPrivateMessage) {
buttons.push({ buttons.push({
className: "topic-admin-archive", className: "topic-admin-archive",
buttonClass: "btn-default",
action: "toggleArchived", action: "toggleArchived",
icon: "folder", icon: "folder",
label: topic.get("archived") ? "actions.unarchive" : "actions.archive" label: topic.get("archived") ? "actions.unarchive" : "actions.archive"
@ -224,6 +234,7 @@ export default createWidget("topic-admin-menu", {
const visible = topic.get("visible"); const visible = topic.get("visible");
buttons.push({ buttons.push({
className: "topic-admin-visible", className: "topic-admin-visible",
buttonClass: "btn-default",
action: "toggleVisibility", action: "toggleVisibility",
icon: visible ? "eye-slash" : "eye", icon: visible ? "eye-slash" : "eye",
label: visible ? "actions.invisible" : "actions.visible" label: visible ? "actions.invisible" : "actions.visible"
@ -232,6 +243,7 @@ export default createWidget("topic-admin-menu", {
if (details.get("can_convert_topic")) { if (details.get("can_convert_topic")) {
buttons.push({ buttons.push({
className: "topic-admin-convert", className: "topic-admin-convert",
buttonClass: "btn-default",
action: isPrivateMessage action: isPrivateMessage
? "convertToPublicTopic" ? "convertToPublicTopic"
: "convertToPrivateMessage", : "convertToPrivateMessage",
@ -243,6 +255,7 @@ export default createWidget("topic-admin-menu", {
if (this.currentUser.get("staff")) { if (this.currentUser.get("staff")) {
buttons.push({ buttons.push({
action: "showModerationHistory", action: "showModerationHistory",
buttonClass: "btn-default",
icon: "list", icon: "list",
fullLabel: "admin.flags.moderation_history" fullLabel: "admin.flags.moderation_history"
}); });

2
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -337,7 +337,7 @@ createWidget("timeline-footer-controls", {
if (topic.get("details.can_create_post")) { if (topic.get("details.can_create_post")) {
controls.push( controls.push(
this.attach("button", { this.attach("button", {
className: "create", className: "btn-default create",
icon: "reply", icon: "reply",
title: "topic.reply.help", title: "topic.reply.help",
action: "replyToPost" action: "replyToPost"

2
app/assets/javascripts/select-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
View File

@ -4,7 +4,7 @@ import computed from "ember-addons/ember-computed-decorators";
export default SelectKitHeaderComponent.extend({ export default SelectKitHeaderComponent.extend({
layoutName: layoutName:
"select-kit/templates/components/dropdown-select-box/dropdown-select-box-header", "select-kit/templates/components/dropdown-select-box/dropdown-select-box-header",
classNames: "dropdown-select-box-header", classNames: "btn-default dropdown-select-box-header",
tagName: "button", tagName: "button",
classNameBindings: ["btnClassName"], classNameBindings: ["btnClassName"],

1
app/assets/stylesheets/common/select-kit/toolbar-popup-menu-options.scss
View File

@ -8,7 +8,6 @@
} }
.select-kit-row { .select-kit-row {
border-radius: 4px;
margin-bottom: 5px; margin-bottom: 5px;
padding: 6px 3px; padding: 6px 3px;
background: $primary-low; background: $primary-low;

4
app/views/exceptions/not_found.html.erb
View File

@ -11,7 +11,7 @@
<%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
</div> </div>
<% end %> <% end %>
<a href="<%= path "/top" %>" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a> <a href="<%= path "/top" %>" class="btn btn-default"><%= t 'page_not_found.see_more' %>&hellip;</a>
</div> </div>
<div class="recent-topics"> <div class="recent-topics">
<h2 class="recent-topics-title"><%= t 'page_not_found.recent_topics' %></h2> <h2 class="recent-topics-title"><%= t 'page_not_found.recent_topics' %></h2>
@ -20,7 +20,7 @@
<%= link_to t.title, t.relative_url %><%= category_badge(t.category) %> <%= link_to t.title, t.relative_url %><%= category_badge(t.category) %>
</div> </div>
<% end %> <% end %>
<a href="<%= path "/latest" %>" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a> <a href="<%= path "/latest" %>" class="btn btn-default"><%= t 'page_not_found.see_more' %>&hellip;</a>
</div> </div>
</div> </div>
<% end %> <% end %>

4
plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
View File

@ -112,7 +112,7 @@
<div class="modal-footer discourse-local-dates-create-modal-footer"> <div class="modal-footer discourse-local-dates-create-modal-footer">
{{#if validDate}} {{#if validDate}}
{{d-button class="btn" {{d-button class="btn btn-default"
action="save" action="save"
label="discourse_local_dates.create.form.insert"}} label="discourse_local_dates.create.form.insert"}}
{{/if}} {{/if}}
@ -122,7 +122,7 @@
</a> </a>
{{d-button {{d-button
class="advanced-mode-btn" class="btn-default advanced-mode-btn"
action=(action "advancedMode") action=(action "advancedMode")
icon="cog" icon="cog"
label=toggleModeBtnLabel}} label=toggleModeBtnLabel}}

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

@ -288,7 +288,7 @@ var bootbox = window.bootbox || (function(document, $) {
while (i--) { while (i--) {
var label = null, var label = null,
href = null, href = null,
_class = null, _class = 'btn-default',
icon = '', icon = '',
callback = null; callback = null;