From 9706a0f76ad9f1640bd63466dc5750dd9b4b14dc Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 15 May 2019 08:32:47 +0200
Subject: [PATCH] Remove sort order and add item icons in content and media
 sort dialogs

---
 src/Umbraco.Web.UI.Client/src/less/hacks.less    |  9 +++++++++
 .../src/views/content/sort.html                  | 16 +++-------------
 .../src/views/media/sort.html                    | 15 +++------------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less
index 726b3fa5ed..0b6d1b7a60 100644
--- a/src/Umbraco.Web.UI.Client/src/less/hacks.less
+++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less
@@ -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;
+    }
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
index 789f7fe6b5..471f3de956 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
@@ -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>
-    
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/sort.html b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
index 92632a3256..b893517f1c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
@@ -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>