Consistifying bulk actions UI.

This commit is contained in:
Sipke Schoorstra
2014-10-28 14:18:18 -07:00
parent e0ad32d6ce
commit f35ea47f57
3 changed files with 17 additions and 44 deletions

View File

@@ -7,8 +7,6 @@
align-items: flex-end;
align-content: flex-end;
margin-bottom: 1em;
border: 1px solid #eaeaea;
background: #f5f5f5;
padding: 4px 10px 3px;
}

View File

@@ -1,30 +1,7 @@
.recycle-bin-filter-section {
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
justify-content: flex-start;
align-items: flex-end;
align-content: flex-end;
margin-bottom: 1em;
border: 1px solid #eaeaea;
background: #f5f5f5;
padding: 4px 10px 3px;
}
.filter-control-group {
margin-right: 10px;
margin-bottom: 6px;
}
.filter-control-group label {
padding-bottom: 0;
}
.filter-control-group select {
padding-top: 2px !important;
padding-bottom: 2px !important;
}
.audittrail-list-section table .content-column {
.audittrail-list-section table .content-column {
white-space: nowrap;
}
.recycle-bin-list-section {
margin: 1em 0;
}

View File

@@ -15,20 +15,18 @@
<div id="recycle-bin">
@Html.ValidationSummary()
@using (Html.BeginFormAntiForgeryPost()) {
<section class="recycle-bin-filter-section">
<div class="filter-control-group">
<label>@T("Actions:")</label>
<select name="RecycleBinCommand">
<option></option>
<option value="@RecycleBinCommand.Restore" data-unsafe-action="@T("Are you sure you want to restore the selected items?")" @if(Model.RecycleBinCommand == RecycleBinCommand.Restore){<text>selected="selected"</text>}>@T("Restore")</option>
@**TODO: Decide wether or not to allow users to permanently delete items. Commented out for now.*@
@*<option value="@RecycleBinCommand.Destroy" data-unsafe-action="@T("WARNING: This will PERMANENTLY delete the selected content items, including related content part records, never to be seen again. Are you sure you want to do this?")" @if (Model.RecycleBinCommand == RecycleBinCommand.Destroy) { <text> selected="selected" </text> }>@T("Remove Permanently ☠")</option>*@
</select>
</div>
<div class="filter-control-group">
<button type="submit" class="filter-apply-button" name="ExecuteActionButton" value="ExecuteActionButton">@T("Execute")</button>
</div>
</section>
<fieldset class="bulk-actions">
<label>@T("Actions:")</label>
<select name="RecycleBinCommand">
<option></option>
<option value="@RecycleBinCommand.Restore" data-unsafe-action="@T("Are you sure you want to restore the selected items?")" @if(Model.RecycleBinCommand == RecycleBinCommand.Restore){<text>selected="selected"</text>}>@T("Restore")</option>
@**TODO: Decide wether or not to allow users to permanently delete items. Commented out for now.*@
@*<option value="@RecycleBinCommand.Destroy" data-unsafe-action="@T("WARNING: This will PERMANENTLY delete the selected content items, including related content part records, never to be seen again. Are you sure you want to do this?")" @if (Model.RecycleBinCommand == RecycleBinCommand.Destroy) { <text> selected="selected" </text> }>@T("Remove Permanently ☠")</option>*@
</select>
</fieldset>
<div class="bulk-actions">
<button type="submit" class="filter-apply-button" name="ExecuteActionButton" value="ExecuteActionButton">@T("Execute")</button>
</div>
<section class="recycle-bin-list-section">
@if (!contentItems.Any()) {
<p class="info">@T("There are no records to display.")</p>