yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5465 from kjac/v8-feature-content-sort-ux

Browse Source 
V8: UX update for content/media sort dialog
This commit is contained in:
Sebastiaan Janssen
2019-05-31 16:40:17 +02:00
committed by GitHub
parent 4eb897ccff 9706a0f76a
commit a74a0c343e
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/less/hacks.less
View File

@@ -221,3 +221,12 @@ pre {
border: 0;
}
}
/* Styling for content/media sort order dialog */
.sort-order {
td.tree-icon {
font-size:20px;
width:20px;
padding-right:0;
}
}

16
src/Umbraco.Web.UI.Client/src/views/content/sort.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Editors.Content.SortController as vm" ng-cloak>
<div class="umb-dialog-body with-footer">
<div class="umb-dialog-body with-footer sort-order">
<div class="umb-pane">
@@ -19,7 +19,7 @@
<table class="table table-condensed table-sortable" ng-if="vm.children">
<thead>
<tr>
<th>
<th colspan="2">
<a ng-href="#" ng-click="vm.sort('name')" prevent-default>
<localize key="general_name"></localize>
<span ng-if="vm.sortOrder.column === 'name'">
@@ -37,22 +37,13 @@
</span>
</a>
</th>
<th>
<a ng-href="#" ng-click="vm.sort('sortOrder')" prevent-default>
<localize key="sort_sortOrder"></localize>
<span ng-if="vm.sortOrder.column === 'sortOrder'">
<i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
<i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
</span>
</a>
</th>
</tr>
</thead>
<tbody ui-sortable="vm.sortableOptions" ng-model="vm.children">
<tr ng-repeat="child in vm.children">
<td class="tree-icon"><i class="{{ child.icon }}"></i></td>
<td>{{ child.name }}</td>
<td>{{ child.createDate }}</td>
<td>{{ child.sortOrder }}</td>
</tr>
</tbody>
</table>
@@ -86,4 +77,3 @@
</div>
</div>

15
src/Umbraco.Web.UI.Client/src/views/media/sort.html
View File

@@ -1,6 +1,6 @@
<div ng-controller="Umbraco.Editors.Media.SortController as vm" ng-cloak>
<div class="umb-dialog-body with-footer">
<div class="umb-dialog-body with-footer sort-order">
<div class="umb-pane">
@@ -19,7 +19,7 @@
<table class="table table-condensed table-sortable" ng-if="vm.children">
<thead>
<tr>
<th>
<th colspan="2">
<a ng-href="#" ng-click="vm.sort('name')" prevent-default>
<localize key="general_name"></localize>
<span ng-if="vm.sortOrder.column === 'name'">
@@ -37,22 +37,13 @@
</span>
</a>
</th>
<th>
<a ng-href="#" ng-click="vm.sort('sortOrder')" prevent-default>
<localize key="sort_sortOrder"></localize>
<span ng-if="vm.sortOrder.column === 'sortOrder'">
<i ng-if="vm.sortOrder.reverse" class="icon-navigation-up"></i>
<i ng-if="!vm.sortOrder.reverse" class="icon-navigation-down"></i>
</span>
</a>
</th>
</tr>
</thead>
<tbody ui-sortable="vm.sortableOptions" ng-model="vm.children">
<tr ng-repeat="child in vm.children">
<td class="tree-icon"><i class="{{ child.icon }}"></i></td>
<td>{{ child.name }}</td>
<td>{{ child.createDate }}</td>
<td>{{ child.sortOrder }}</td>
</tr>
</tbody>
</table>