IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Show Rollback and Backup buttons on same line

Browse Source
This commit is contained in:
Gerhard Schlager 2018-08-31 12:01:59 +02:00
parent 8ce8edaf40
commit 5310b4841d
2 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,33 +5,31 @@
{{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}} {{nav-item route='admin.backups.index' label='admin.backups.menu.backups'}}
{{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}} {{nav-item route='admin.backups.logs' label='admin.backups.menu.logs'}}
{{plugin-outlet name="downloader" tagName=""}} {{plugin-outlet name="downloader" tagName=""}}
<div class="backup-operations"> <div class="admin-actions">
{{#if model.canRollback}} {{#if model.canRollback}}
{{d-button action="rollback" {{d-button action="rollback"
class="btn-rollback" class="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"
disabled=rollbackDisabled}} disabled=rollbackDisabled}}
{{/if}} {{/if}}
{{#if model.isOperationRunning}} {{#if model.isOperationRunning}}
{{d-button action="cancelOperation" {{d-button action="cancelOperation"
class="btn-danger" class="btn-danger"
title="admin.backups.operations.cancel.title" title="admin.backups.operations.cancel.title"
label="admin.backups.operations.cancel.label" label="admin.backups.operations.cancel.label"
icon="times"}} icon="times"}}
{{else}} {{else}}
{{d-button action="startBackup" {{d-button action="startBackup"
class="btn-primary" class="btn-primary"
title="admin.backups.operations.backup.title" title="admin.backups.operations.backup.title"
label="admin.backups.operations.backup.label" label="admin.backups.operations.backup.label"
icon="rocket"}} icon="rocket"}}
{{/if}} {{/if}}
</div> </div>
</ul> </ul>
</nav> </nav>
</div> </div>
<div class="admin-container"> <div class="admin-container">

12
app/assets/stylesheets/common/admin/backups.scss
View File

@ -17,18 +17,6 @@ $rollback-darker: darken($rollback, 20%) !default;
} }
} }
.backups {
.admin-controls {
.backup-operations {
margin-left: auto;
button {
display: flex;
margin-right: 20px;
}
}
}
}
.admin-backups { .admin-backups {
table { table {
@media screen and (min-width: 550px) { @media screen and (min-width: 550px) {