From 972f9b35469de1093964dc548876bdca7ad7dcfd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 10:43:10 +0100
Subject: [PATCH 01/10] implement mini list view for content move dialog

---
 .../views/content/content.move.controller.js  | 71 ++++++++-----------
 .../src/views/content/move.html               | 54 ++++++++------
 2 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
index c6de405ff6..ce81a60a38 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
@@ -20,53 +20,29 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 	    var node = dialogOptions.currentNode;
 
 	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
 
-	        if (args.node.metaData.listViewNode) {
-	            //check if list view 'search' node was selected
+			if(args && args.event) {
+				args.event.preventDefault();
+				args.event.stopPropagation();
+			}
 
-	            $scope.searchInfo.showSearch = true;
-	            $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-	            $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-	        }
-	        else {
-	            eventsService.emit("editors.content.moveController.select", args);
+			eventsService.emit("editors.content.moveController.select", args);
 
-	            if ($scope.target) {
-	                //un-select if there's a current one selected
-	                $scope.target.selected = false;
-	            }
+			if ($scope.target) {
+				//un-select if there's a current one selected
+				$scope.target.selected = false;
+			}
+
+			$scope.target = args.node;
+			$scope.target.selected = true;
 
-	            $scope.target = args.node;
-	            $scope.target.selected = true;
-	        }	        
 	    }
 
 	    function nodeExpandedHandler(ev, args) {
-	        if (angular.isArray(args.children)) {
-
-	            //iterate children
-	            _.each(args.children, function (child) {
-	                //check if any of the items are list views, if so we need to add a custom 
-	                // child: A node to activate the search
-	                if (child.metaData.isContainer) {
-	                    child.hasChildren = true;
-	                    child.children = [
-	                        {
-	                            level: child.level + 1,
-	                            hasChildren: false,
-	                            name: searchText,
-	                            metaData: {
-	                                listViewNode: child,
-	                            },
-	                            cssClass: "icon umb-tree-icon sprTree icon-search",
-	                            cssClasses: ["not-published"]
-	                        }
-	                    ];
-	                }
-	            });
-	        }
+			// open mini list view for list views
+          	if (args.node.metaData.isContainer) {
+				openMiniListView(args.node);
+			}
 	    }
 
 	    $scope.hideSearch = function () {
@@ -136,4 +112,19 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
 	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
 	    });
+
+		// Mini list view
+		$scope.selectListViewNode = function (node) {
+			node.selected = node.selected === true ? false : true;
+			nodeSelectHandler({}, { node: node });
+		};
+
+		$scope.closeMiniListView = function () {
+			$scope.miniListView = undefined;
+		};
+
+		function openMiniListView(node) {
+			$scope.miniListView = node;
+		}
+
 	});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index 6bf3ca817a..7bf54828cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -24,31 +24,45 @@
 
             <div ng-hide="success">
 
-                <umb-tree-search-box hide-search-callback="hideSearch"
-                                     search-callback="onSearchResults"
-                                     search-from-id="{{searchInfo.searchFromId}}"
-                                     search-from-name="{{searchInfo.searchFromName}}"
-                                     show-search="{{searchInfo.showSearch}}"
-                                     section="{{section}}">
-                </umb-tree-search-box>
+                <div ng-hide="miniListView">
+                    <umb-tree-search-box 
+                        hide-search-callback="hideSearch"
+                        search-callback="onSearchResults"
+                        search-from-id="{{searchInfo.searchFromId}}"
+                        search-from-name="{{searchInfo.searchFromName}}"
+                        show-search="{{searchInfo.showSearch}}"
+                        section="{{section}}">
+                    </umb-tree-search-box>
 
-                <br />
+                    <br />
 
-                <umb-tree-search-results ng-if="searchInfo.showSearch"
-                                         results="searchInfo.results"
-                                         select-result-callback="selectResult">
-                </umb-tree-search-results>
+                    <umb-tree-search-results
+                        ng-if="searchInfo.showSearch"
+                        results="searchInfo.results"
+                        select-result-callback="selectResult">
+                    </umb-tree-search-results>
 
-                <div ng-hide="searchInfo.showSearch">
-                    <umb-tree section="content"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              eventhandler="dialogTreeEventHandler"
-                              enablecheckboxes="true">
-                    </umb-tree>
+                    <div ng-hide="searchInfo.showSearch">
+                        <umb-tree 
+                            section="content"
+                            hideheader="false"
+                            hideoptions="true"
+                            isdialog="true"
+                            eventhandler="dialogTreeEventHandler"
+                            enablelistviewexpand="true"
+                            enablecheckboxes="true">
+                        </umb-tree>
+                    </div>
                 </div>
 
+                <umb-mini-list-view
+                    ng-if="miniListView"
+                    node="miniListView"
+                    entity-type="Document"
+                    on-select="selectListViewNode(node)"
+                    on-close="closeMiniListView()">
+                </umb-mini-list-view>
+
             </div>
         </div>
     </div>

From 0a56f46b12f9f4a9fbae41f987ec31eb5d2cfc60 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 10:44:55 +0100
Subject: [PATCH 02/10] Implement mini list view for content copy dialog

---
 .../views/content/content.copy.controller.js  | 70 ++++++++-----------
 .../src/views/content/copy.html               | 55 +++++++++------
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
index 9fb6e60c66..9940aebe64 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
@@ -22,54 +22,29 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	    var node = dialogOptions.currentNode;
 
 	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
 
-	        if (args.node.metaData.listViewNode) {
-	            //check if list view 'search' node was selected
+			if(args && args.event) {
+	        	args.event.preventDefault();
+	        	args.event.stopPropagation();
+			}
 
-	            $scope.searchInfo.showSearch = true;
-	            $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-	            $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-	        }
-	        else {
-	            eventsService.emit("editors.content.copyController.select", args);
+			eventsService.emit("editors.content.copyController.select", args);
 
-	            if ($scope.target) {
-	                //un-select if there's a current one selected
-	                $scope.target.selected = false;
-	            }
+			if ($scope.target) {
+				//un-select if there's a current one selected
+				$scope.target.selected = false;
+			}
 
-	            $scope.target = args.node;
-	            $scope.target.selected = true;
-	        }
+			$scope.target = args.node;
+			$scope.target.selected = true;
 
 	    }
 
 	    function nodeExpandedHandler(ev, args) {
-	        if (angular.isArray(args.children)) {
-
-	            //iterate children
-	            _.each(args.children, function (child) {
-	                //check if any of the items are list views, if so we need to add a custom
-	                // child: A node to activate the search
-	                if (child.metaData.isContainer) {
-	                    child.hasChildren = true;
-	                    child.children = [
-	                        {
-	                            level: child.level + 1,
-	                            hasChildren: false,
-	                            name: searchText,
-	                            metaData: {
-	                                listViewNode: child,
-	                            },
-	                            cssClass: "icon umb-tree-icon sprTree icon-search",
-	                            cssClasses: ["not-published"]
-	                        }
-	                    ];
-	                }
-	            });
-	        }
+			// open mini list view for list views
+          	if (args.node.metaData.isContainer) {
+				openMiniListView(args.node);
+			}
 	    }
 
 	    $scope.hideSearch = function () {
@@ -136,4 +111,19 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
 	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
 	    });
+
+		// Mini list view
+		$scope.selectListViewNode = function (node) {
+			node.selected = node.selected === true ? false : true;
+			nodeSelectHandler({}, { node: node });
+		};
+
+		$scope.closeMiniListView = function () {
+			$scope.miniListView = undefined;
+		};
+
+		function openMiniListView(node) {
+			$scope.miniListView = node;
+		}
+		
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 371e156513..eca7a60a44 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -25,36 +25,49 @@
 
             <div ng-hide="success">
 
-                <umb-tree-search-box hide-search-callback="hideSearch"
-                                     search-callback="onSearchResults"
-                                     search-from-id="{{searchInfo.searchFromId}}"
-                                     search-from-name="{{searchInfo.searchFromName}}"
-                                     show-search="{{searchInfo.showSearch}}"
-                                     section="{{section}}">
-                </umb-tree-search-box>
+                <div ng-hide="miniListView">
+                    <umb-tree-search-box
+                        hide-search-callback="hideSearch"
+                        search-callback="onSearchResults"
+                        search-from-id="{{searchInfo.searchFromId}}"
+                        search-from-name="{{searchInfo.searchFromName}}"
+                        show-search="{{searchInfo.showSearch}}"
+                        section="{{section}}">
+                    </umb-tree-search-box>
 
-                <br />
+                    <br />
 
-                <umb-tree-search-results ng-if="searchInfo.showSearch"
-                                         results="searchInfo.results"
-                                         select-result-callback="selectResult">
-                </umb-tree-search-results>
+                    <umb-tree-search-results
+                        ng-if="searchInfo.showSearch"
+                        results="searchInfo.results"
+                        select-result-callback="selectResult">
+                    </umb-tree-search-results>
 
-                <div ng-hide="searchInfo.showSearch">
-                    <umb-tree section="content"
-                              hideheader="false"
-                              hideoptions="true"
-                              isdialog="true"
-                              eventhandler="dialogTreeEventHandler"
-                              enablecheckboxes="true">
-                    </umb-tree>
+                    <div ng-hide="searchInfo.showSearch">
+                        <umb-tree
+                            section="content"
+                            hideheader="false"
+                            hideoptions="true"
+                            isdialog="true"
+                            eventhandler="dialogTreeEventHandler"
+                            enablelistviewexpand="true"
+                            enablecheckboxes="true">
+                        </umb-tree>
+                    </div>
                 </div>
 
+                <umb-mini-list-view
+                    ng-if="miniListView"
+                    node="miniListView"
+                    entity-type="Document"
+                    on-select="selectListViewNode(node)"
+                    on-close="closeMiniListView()">
+                </umb-mini-list-view>
+
                 <umb-pane>
                     <umb-control-group  localize="label" label="@defaultdialogs_relateToOriginalLabel">
                         <input type="checkbox" ng-model="$parent.$parent.relateToOriginal"/>
                     </umb-control-group>
-               
                 </umb-pane>
 
                 <umb-pane>

From df9d09725be61bd16a09367b982899903cc8667f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 11:25:00 +0100
Subject: [PATCH 03/10] add entity helper so we don't have to hard code these
 values all over the place

---
 .../common/services/entityhelper.service.js   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js
new file mode 100644
index 0000000000..cb87787654
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/entityhelper.service.js
@@ -0,0 +1,29 @@
+(function() {
+   'use strict';
+
+   function entityHelper() {
+
+        function getEntityTypeFromSection(section) {
+            if (section === "member") {
+                return "Member";
+            }
+            else if (section === "media") {
+                return "Media";
+            } else {
+                return "Document";
+            }
+        }
+
+        ////////////
+
+        var service = {
+            getEntityTypeFromSection: getEntityTypeFromSection
+        };
+
+        return service;
+
+   }
+
+   angular.module('umbraco.services').factory('entityHelper', entityHelper);
+
+})();

From d2164bc94db24cad00c7fa422ac1e1214a1f401e Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 11:26:08 +0100
Subject: [PATCH 04/10] Implement mini list view for generic copy overlay

---
 .../common/overlays/copy/copy.controller.js   | 76 ++++++++-----------
 .../src/views/common/overlays/copy/copy.html  | 65 +++++++++-------
 2 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
index 5d3ea998d9..df6b51bea0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.controller.js
@@ -1,7 +1,7 @@
  (function() {
 	"use strict";
 
-	function CopyOverlay($scope, localizationService, eventsService) {
+	function CopyOverlay($scope, localizationService, eventsService, entityHelper) {
 
       var vm = this;
 
@@ -32,54 +32,30 @@
           selectedSearchResults: []
       };
 
+      // get entity type based on the section
+      $scope.entityType = entityHelper.getEntityTypeFromSection(dialogOptions.section);
+
       function nodeSelectHandler(ev, args) {
-          args.event.preventDefault();
-          args.event.stopPropagation();
-
-          if (args.node.metaData.listViewNode) {
-              //check if list view 'search' node was selected
-
-              vm.searchInfo.showSearch = true;
-              vm.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-              vm.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-          }
-          else {
-              //eventsService.emit("editors.content.copyController.select", args);
-
-              if ($scope.model.target) {
-                  //un-select if there's a current one selected
-                  $scope.model.target.selected = false;
-              }
-
-              $scope.model.target = args.node;
-              $scope.model.target.selected = true;
+          if(args && args.event) {
+            args.event.preventDefault();
+            args.event.stopPropagation();
           }
 
+          //eventsService.emit("editors.content.copyController.select", args);
+
+          if ($scope.model.target) {
+              //un-select if there's a current one selected
+              $scope.model.target.selected = false;
+          }
+
+          $scope.model.target = args.node;
+          $scope.model.target.selected = true;
       }
 
       function nodeExpandedHandler(ev, args) {
-          if (angular.isArray(args.children)) {
-
-              //iterate children
-              _.each(args.children, function (child) {
-                  //check if any of the items are list views, if so we need to add a custom
-                  // child: A node to activate the search
-                  if (child.metaData.isContainer) {
-                      child.hasChildren = true;
-                      child.children = [
-                          {
-                              level: child.level + 1,
-                              hasChildren: false,
-                              name: searchText,
-                              metaData: {
-                                  listViewNode: child,
-                              },
-                              cssClass: "icon umb-tree-icon sprTree icon-search",
-                              cssClasses: ["not-published"]
-                          }
-                      ];
-                  }
-              });
+          // open mini list view for list views
+          if (args.node.metaData.isContainer) {
+              openMiniListView(args.node);
           }
       }
 
@@ -110,6 +86,20 @@
           $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
       });
 
+      // Mini list view
+      $scope.selectListViewNode = function (node) {
+          node.selected = node.selected === true ? false : true;
+		  nodeSelectHandler({}, { node: node });
+      };
+
+      $scope.closeMiniListView = function () {
+          $scope.miniListView = undefined;
+      };
+
+      function openMiniListView(node) {
+          $scope.miniListView = node;
+      }
+
 
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html
index c0e22c4d27..aeafaec04b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/copy/copy.html
@@ -1,34 +1,47 @@
 <div ng-controller="Umbraco.Overlays.CopyOverlay as vm">
 
-   <div class="umb-control-group">
-      <umb-tree-search-box
-         hide-search-callback="vm.hideSearch"
-         search-callback="vm.onSearchResults"
-         search-from-id="{{vm.searchInfo.searchFromId}}"
-         search-from-name="{{vm.searchInfo.searchFromName}}"
-         show-search="{{vm.searchInfo.showSearch}}"
-         section="{{model.section}}">
-      </umb-tree-search-box>
-   </div>
+   <div ng-hide="miniListView">
+        <div class="umb-control-group">
+            <umb-tree-search-box
+                hide-search-callback="vm.hideSearch"
+                search-callback="vm.onSearchResults"
+                search-from-id="{{vm.searchInfo.searchFromId}}"
+                search-from-name="{{vm.searchInfo.searchFromName}}"
+                show-search="{{vm.searchInfo.showSearch}}"
+                section="{{model.section}}">
+            </umb-tree-search-box>
+        </div>
 
-   <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
-      <umb-tree-search-results
-         ng-if="vm.searchInfo.showSearch"
-         results="vm.searchInfo.results"
-         select-result-callback="vm.selectResult">
-      </umb-tree-search-results>
-   </div>
+        <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
+            <umb-tree-search-results
+                ng-if="vm.searchInfo.showSearch"
+                results="vm.searchInfo.results"
+                select-result-callback="vm.selectResult">
+            </umb-tree-search-results>
+        </div>
+
+        <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
+            <umb-tree
+                section="{{model.section}}"
+                hideheader="false"
+                hideoptions="true"
+                isdialog="true"
+                eventhandler="dialogTreeEventHandler"
+                enablelistviewexpand="true"
+                enablecheckboxes="true">
+            </umb-tree>
+        </div>
 
-   <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
-       <umb-tree
-         section="{{model.section}}"
-         hideheader="false"
-         hideoptions="true"
-         isdialog="true"
-         eventhandler="dialogTreeEventHandler"
-         enablecheckboxes="true">
-       </umb-tree>
    </div>
+   
+   <div ng-if="miniListView" class="umb-control-group">
+        <umb-mini-list-view
+            node="miniListView"
+            entity-type="{{entityType}}"
+            on-select="selectListViewNode(node)"
+            on-close="closeMiniListView()">
+        </umb-mini-list-view>
+    </div>
 
    <div class="umb-control-group -no-border">
       <label>

From e465a937c59e3dba09e732da74f76274f12172a1 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 11:26:53 +0100
Subject: [PATCH 05/10] Implement mini list view for generic move overlay

---
 .../common/overlays/move/move.controller.js   | 69 ++++++++-----------
 .../src/views/common/overlays/move/move.html  | 64 +++++++++--------
 2 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
index a7a14354ed..78b7c7be34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.controller.js
@@ -1,7 +1,7 @@
  (function() {
 	"use strict";
 
-	function MoveOverlay($scope, localizationService, eventsService) {
+	function MoveOverlay($scope, localizationService, eventsService, entityHelper) {
 
       var vm = this;
 
@@ -32,54 +32,32 @@
           selectedSearchResults: []
       };
 
+      // get entity type based on the section
+      $scope.entityType = entityHelper.getEntityTypeFromSection(dialogOptions.section);
+
       function nodeSelectHandler(ev, args) {
-          args.event.preventDefault();
-          args.event.stopPropagation();
 
-          if (args.node.metaData.listViewNode) {
-              //check if list view 'search' node was selected
-
-              vm.searchInfo.showSearch = true;
-              vm.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-              vm.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
+          if(args && args.event) {
+              args.event.preventDefault();
+              args.event.stopPropagation();
           }
-          else {
-              //eventsService.emit("editors.content.copyController.select", args);
 
-              if ($scope.model.target) {
-                  //un-select if there's a current one selected
-                  $scope.model.target.selected = false;
-              }
+          //eventsService.emit("editors.content.copyController.select", args);
 
-              $scope.model.target = args.node;
-              $scope.model.target.selected = true;
+          if ($scope.model.target) {
+              //un-select if there's a current one selected
+              $scope.model.target.selected = false;
           }
 
+          $scope.model.target = args.node;
+          $scope.model.target.selected = true;
+
       }
 
       function nodeExpandedHandler(ev, args) {
-          if (angular.isArray(args.children)) {
-
-              //iterate children
-              _.each(args.children, function (child) {
-                  //check if any of the items are list views, if so we need to add a custom
-                  // child: A node to activate the search
-                  if (child.metaData.isContainer) {
-                      child.hasChildren = true;
-                      child.children = [
-                          {
-                              level: child.level + 1,
-                              hasChildren: false,
-                              name: searchText,
-                              metaData: {
-                                  listViewNode: child,
-                              },
-                              cssClass: "icon umb-tree-icon sprTree icon-search",
-                              cssClasses: ["not-published"]
-                          }
-                      ];
-                  }
-              });
+          // open mini list view for list views
+          if (args.node.metaData.isContainer) {
+              openMiniListView(args.node);
           }
       }
 
@@ -110,6 +88,19 @@
           $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
       });
 
+      // Mini list view
+      $scope.selectListViewNode = function (node) {
+	      node.selected = node.selected === true ? false : true;
+		  nodeSelectHandler({}, { node: node });
+      };
+
+      $scope.closeMiniListView = function () {
+        $scope.miniListView = undefined;
+      };
+
+      function openMiniListView(node) {
+        $scope.miniListView = node;
+      }
 
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html
index c30f911cd9..34130c31a8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/move/move.html
@@ -1,33 +1,43 @@
 <div ng-controller="Umbraco.Overlays.MoveOverlay as vm">
+  <div ng-hide="miniListView">
+    <div class="umb-control-group">
+        <umb-tree-search-box
+          hide-search-callback="vm.hideSearch"
+          search-callback="vm.onSearchResults"
+          search-from-id="{{vm.searchInfo.searchFromId}}"
+          search-from-name="{{vm.searchInfo.searchFromName}}"
+          show-search="{{vm.searchInfo.showSearch}}"
+          section="{{model.section}}">
+        </umb-tree-search-box>
+    </div>
 
-   <div class="umb-control-group">
-      <umb-tree-search-box
-         hide-search-callback="vm.hideSearch"
-         search-callback="vm.onSearchResults"
-         search-from-id="{{vm.searchInfo.searchFromId}}"
-         search-from-name="{{vm.searchInfo.searchFromName}}"
-         show-search="{{vm.searchInfo.showSearch}}"
-         section="{{model.section}}">
-      </umb-tree-search-box>
+    <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
+        <umb-tree-search-results
+          ng-if="vm.searchInfo.showSearch"
+          results="vm.searchInfo.results"
+          select-result-callback="vm.selectResult">
+        </umb-tree-search-results>
+    </div>
+
+    <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
+        <umb-tree
+          section="{{model.section}}"
+          hideheader="false"
+          hideoptions="true"
+          isdialog="true"
+          eventhandler="dialogTreeEventHandler"
+          enablelistviewexpand="true"
+          enablecheckboxes="true">
+        </umb-tree>
+    </div>
    </div>
 
-   <div class="umb-control-group" ng-show="vm.searchInfo.showSearch">
-      <umb-tree-search-results
-         ng-if="vm.searchInfo.showSearch"
-         results="vm.searchInfo.results"
-         select-result-callback="vm.selectResult">
-      </umb-tree-search-results>
-   </div>
-
-   <div class="umb-control-group -no-border" ng-hide="vm.searchInfo.showSearch">
-       <umb-tree
-         section="{{model.section}}"
-         hideheader="false"
-         hideoptions="true"
-         isdialog="true"
-         eventhandler="dialogTreeEventHandler"
-         enablecheckboxes="true">
-       </umb-tree>
-   </div>
+    <umb-mini-list-view
+      ng-if="miniListView"
+      node="miniListView"
+      entity-type="{{entityType}}"
+      on-select="selectListViewNode(node)"
+      on-close="closeMiniListView()">
+  </umb-mini-list-view>
 
 </div>

From 22f0641c54e0d9ec87f7e68933b1e5625ce56ebd Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 11:58:11 +0100
Subject: [PATCH 06/10] implement mini list view for url picker

---
 .../linkpicker/linkpicker.controller.js       | 98 +++++++++----------
 .../overlays/linkpicker/linkpicker.html       | 57 ++++++-----
 2 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
index e2f95b0478..fde3e4cab3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
@@ -47,69 +47,44 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	    }
 
 	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
 
-	        if (args.node.metaData.listViewNode) {
-	            //check if list view 'search' node was selected
+			if(args && args.event) {
+				args.event.preventDefault();
+				args.event.stopPropagation();
+			}
 
-	            $scope.searchInfo.showSearch = true;
-	            $scope.searchInfo.searchFromId = args.node.metaData.listViewNode.id;
-	            $scope.searchInfo.searchFromName = args.node.metaData.listViewNode.name;
-	        }
-	        else {
-	            eventsService.emit("dialogs.linkPicker.select", args);
+			eventsService.emit("dialogs.linkPicker.select", args);
 
-	            if ($scope.currentNode) {
-	                //un-select if there's a current one selected
-	                $scope.currentNode.selected = false;
-	            }
+			if ($scope.currentNode) {
+				//un-select if there's a current one selected
+				$scope.currentNode.selected = false;
+			}
 
-	            $scope.currentNode = args.node;
-	            $scope.currentNode.selected = true;
-                $scope.model.target.id = args.node.id;
-                $scope.model.target.udi = args.node.udi;
-	            $scope.model.target.name = args.node.name;
+			$scope.currentNode = args.node;
+			$scope.currentNode.selected = true;
+			$scope.model.target.id = args.node.id;
+			$scope.model.target.udi = args.node.udi;
+			$scope.model.target.name = args.node.name;
 
-	            if (args.node.id < 0) {
-	                $scope.model.target.url = "/";
-	            }
-	            else {
-	                contentResource.getNiceUrl(args.node.id).then(function (url) {
-	                    $scope.model.target.url = url;
-	                });
-	            }
+			if (args.node.id < 0) {
+				$scope.model.target.url = "/";
+			}
+			else {
+				contentResource.getNiceUrl(args.node.id).then(function (url) {
+					$scope.model.target.url = url;
+				});
+			}
 
-	            if (!angular.isUndefined($scope.model.target.isMedia)) {
-	                delete $scope.model.target.isMedia;
-	            }
-	        }
+			if (!angular.isUndefined($scope.model.target.isMedia)) {
+				delete $scope.model.target.isMedia;
+			}
 	    }
 
 	    function nodeExpandedHandler(ev, args) {
-	        if (angular.isArray(args.children)) {
-
-	            //iterate children
-	            _.each(args.children, function (child) {
-	                //check if any of the items are list views, if so we need to add a custom
-	                // child: A node to activate the search
-	                if (child.metaData.isContainer) {
-	                    child.hasChildren = true;
-	                    child.children = [
-	                        {
-	                            level: child.level + 1,
-	                            hasChildren: false,
-	                            name: searchText,
-	                            metaData: {
-	                                listViewNode: child,
-	                            },
-	                            cssClass: "icon umb-tree-icon sprTree icon-search",
-	                            cssClasses: ["not-published"]
-	                        }
-	                    ];
-	                }
-	            });
-	        }
+			// open mini list view for list views
+			if (args.node.metaData.isContainer) {
+				openMiniListView(args.node);
+			}
 	    }
 
 	    $scope.switchToMediaPicker = function () {
@@ -160,4 +135,19 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController",
 	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
 	        $scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
 	    });
+
+		// Mini list view
+		$scope.selectListViewNode = function (node) {
+			node.selected = node.selected === true ? false : true;
+			nodeSelectHandler({}, { node: node });
+		};
+
+		$scope.closeMiniListView = function () {
+			$scope.miniListView = undefined;
+		};
+
+		function openMiniListView(node) {
+			$scope.miniListView = node;
+		}
+
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
index e063b7bab3..3e40c79b7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
@@ -28,34 +28,45 @@
             <localize key="defaultdialogs_linkToPage">Link to page</localize>
         </h5>
 
-        <umb-tree-search-box
-            hide-search-callback="hideSearch"
-            search-callback="onSearchResults"
-            search-from-id="{{searchInfo.searchFromId}}"
-            search-from-name="{{searchInfo.searchFromName}}"
-            show-search="{{searchInfo.showSearch}}"
-            section="{{section}}">
-        </umb-tree-search-box>
+        <div ng-hide="miniListView">
+            <umb-tree-search-box
+                hide-search-callback="hideSearch"
+                search-callback="onSearchResults"
+                search-from-id="{{searchInfo.searchFromId}}"
+                search-from-name="{{searchInfo.searchFromName}}"
+                show-search="{{searchInfo.showSearch}}"
+                section="{{section}}">
+            </umb-tree-search-box>
 
-        <br/>
+            <br/>
 
-        <umb-tree-search-results
-            ng-if="searchInfo.showSearch"
-            results="searchInfo.results"
-            select-result-callback="selectResult">
-        </umb-tree-search-results>
+            <umb-tree-search-results
+                ng-if="searchInfo.showSearch"
+                results="searchInfo.results"
+                select-result-callback="selectResult">
+            </umb-tree-search-results>
 
-        <div ng-hide="searchInfo.showSearch">
-            <umb-tree
-                section="content"
-                hideheader="true"
-                hideoptions="true"
-                eventhandler="dialogTreeEventHandler"
-                isdialog="true"
-                enablecheckboxes="true">
-            </umb-tree>
+            <div ng-hide="searchInfo.showSearch">
+                <umb-tree
+                    section="content"
+                    hideheader="true"
+                    hideoptions="true"
+                    eventhandler="dialogTreeEventHandler"
+                    enablelistviewexpand="true"
+                    isdialog="true"
+                    enablecheckboxes="true">
+                </umb-tree>
+            </div>
         </div>
 
+        <umb-mini-list-view
+            ng-if="miniListView"
+            node="miniListView"
+            entity-type="Document"
+            on-select="selectListViewNode(node)"
+            on-close="closeMiniListView()">
+        </umb-mini-list-view>
+
     </div>
 
     <div class="umb-control-group">

From b90cccbfff1d93cd8eca24bebb81f87af59ab514 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 22 Mar 2017 13:45:09 +0100
Subject: [PATCH 07/10] implement mini list view for media copy

---
 .../src/views/media/media.move.controller.js  | 32 +++++++++++++++++--
 .../src/views/media/move.html                 | 28 ++++++++++++----
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
index 46ee51ce64..b7c4032b10 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
@@ -7,8 +7,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
 	    var node = dialogOptions.currentNode;
 
 	    function nodeSelectHandler(ev, args) {
-	        args.event.preventDefault();
-	        args.event.stopPropagation();
+
+			if(args && args.event) {
+				args.event.preventDefault();
+				args.event.stopPropagation();
+			}
 
 	        eventsService.emit("editors.media.moveController.select", args);
 
@@ -21,8 +24,15 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
 	        $scope.target.selected = true;
 	    }
 
-	    $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+		function nodeExpandedHandler(ev, args) {
+			// open mini list view for list views
+        	if (args.node.metaData.isContainer) {
+				openMiniListView(args.node);
+			}
+	    }
 
+	    $scope.dialogTreeEventHandler.bind("treeNodeSelect", nodeSelectHandler);
+	    $scope.dialogTreeEventHandler.bind("treeNodeExpanded", nodeExpandedHandler);
 
 	    $scope.move = function () {
 	        mediaResource.move({ parentId: $scope.target.id, id: node.id })
@@ -55,5 +65,21 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
 
 	    $scope.$on('$destroy', function () {
 	        $scope.dialogTreeEventHandler.unbind("treeNodeSelect", nodeSelectHandler);
+			$scope.dialogTreeEventHandler.unbind("treeNodeExpanded", nodeExpandedHandler);
 	    });
+
+		// Mini list view
+		$scope.selectListViewNode = function (node) {
+			node.selected = node.selected === true ? false : true;
+			nodeSelectHandler({}, { node: node });
+		};
+
+		$scope.closeMiniListView = function () {
+			$scope.miniListView = undefined;
+		};
+
+		function openMiniListView(node) {
+			$scope.miniListView = node;
+		}
+
 	});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index 3f71340ee3..971ac0c024 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -21,13 +21,27 @@
 		</div>
 
 		<div ng-hide="success">
-            <umb-tree section="media"
-                      hideheader="false"
-                      hideoptions="true"
-                      isdialog="true"
-                      eventhandler="dialogTreeEventHandler"
-                      enablecheckboxes="true">
-            </umb-tree>
+            
+			<div ng-hide="miniListView">
+				<umb-tree
+					section="media"
+					hideheader="false"
+					hideoptions="true"
+					isdialog="true"
+					eventhandler="dialogTreeEventHandler"
+					enablelistviewexpand="true"
+					enablecheckboxes="true">
+				</umb-tree>
+			</div>
+
+			<umb-mini-list-view
+				ng-if="miniListView"
+				node="miniListView"
+				entity-type="Media"
+				on-select="selectListViewNode(node)"
+				on-close="closeMiniListView()">
+			</umb-mini-list-view>
+
 		</div>
 	</div>
 </div>

From 7461e7c55b2c64e71cd2fbea6e6f12237db9567b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 23 Mar 2017 11:36:51 +0100
Subject: [PATCH 08/10] align styling of error and success messages for content
 (move/copy) and media (move)

---
 .../src/views/content/copy.html               | 32 ++++++++++---------
 .../src/views/content/move.html               | 26 ++++++++-------
 .../src/views/media/move.html                 | 28 ++++++++--------
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index eca7a60a44..c19ec72dbd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -1,6 +1,22 @@
 <div ng-controller="Umbraco.Editors.Content.CopyController">
-    <div class="umb-dialog-body form-horizontal">
+    <div class="umb-dialog-body form-horizontal" ng-cloak>
         <div class="umb-pane">
+
+            <div ng-show="error">
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
+            </div>
+
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> was copied to
+                    <strong>{{target.name}}</strong>
+                </div>
+                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+            </div>
+
             <p class="abstract" ng-hide="success">
                 Choose where to copy <strong>{{currentNode.name}}</strong> to in the tree structure below
             </p>
@@ -9,20 +25,6 @@
                 <div class="umb-loader"></div>
             </div>
 
-            <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
-            </div>
-
-            <div class="alert alert-success" ng-show="success">
-                <p>
-                    <strong>{{currentNode.name}}</strong> was copied to
-                    <strong>{{target.name}}</strong>
-                </p>
-
-                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
-            </div>
-
             <div ng-hide="success">
 
                 <div ng-hide="miniListView">
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index 7bf54828cd..964e4d548c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -1,7 +1,21 @@
 <div ng-controller="Umbraco.Editors.Content.MoveController">
-    <div class="umb-dialog-body">
+    <div class="umb-dialog-body" ng-cloak>
         <div class="umb-pane">
 
+            <div ng-show="error">
+                <div class="alert alert-error">
+                    <div><strong>{{error.errorMsg}}</strong></div>
+                    <div>{{error.data.message}}</div>
+                </div>
+            </div>
+
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong>
+                </div>
+                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+            </div>
+
             <p class="abstract" ng-hide="success">
                 <localize key="actions_chooseWhereToMove">Choose where to move</localize>
                 <strong>{{currentNode.name}}</strong>
@@ -12,16 +26,6 @@
                 <div class="umb-loader"></div>
             </div>
 
-            <div ng-show="error">
-                <h5 class="text-error">{{error.errorMsg}}</h5>
-                <p class="text-error">{{error.data.message}}</p>
-            </div>
-
-            <div ng-show="success">
-                <h5 class="text-success"><strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong></h5>
-                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
-            </div>
-
             <div ng-hide="success">
 
                 <div ng-hide="miniListView">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index 971ac0c024..2a56e3de3c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -1,25 +1,27 @@
 <div ng-controller="Umbraco.Editors.Media.MoveController">
-<div class="umb-dialog-body">
+<div class="umb-dialog-body" ng-cloak>
 	<div class="umb-pane">
 
+		<div ng-show="error">
+			<div class="alert alert-error">
+				<div><strong>{{error.errorMsg}}</strong></div>
+				<div>{{error.data.message}}</div>
+            </div>
+        </div>
+
+		<div ng-show="success">
+			<div class="alert alert-success">
+				<strong>{{currentNode.name}}</strong> was moved underneath <strong>{{target.name}}</strong>
+			</div>
+			<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+		</div>
+
 		<p class="abstract" ng-hide="success">
             <localize key="actions_chooseWhereToMove">Choose where to move</localize>
             <strong>{{currentNode.name}}</strong>
             <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
         </p>
 
-		<div class="alert alert-error" ng-show="error" ng-cloak>
-			<h4>{{error.errorMsg}}</h4>
-			<p>{{error.data.Message}}</p>
-		</div>
-
-		<div class="alert alert-success" ng-show="success" ng-cloak>
-			<p><strong>{{currentNode.name}}</strong> was moved underneath
-			<strong>{{target.name}}</strong></p>
-
-			<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
-		</div>
-
 		<div ng-hide="success">
             
 			<div ng-hide="miniListView">

From 4a32cddf088dab7ab57cc3dfecd66ebd321f1ea0 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 23 Mar 2017 11:37:13 +0100
Subject: [PATCH 09/10] make tree search box full width

---
 .../src/views/components/tree/umb-tree-search-box.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
index fde38dcb62..6bb2d120c8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
@@ -3,7 +3,7 @@
     <a class="icon icon-arrow-left" ng-if="showSearch == 'true'" title="Back" ng-click="hideSearch()"></a>
     <input type="text"
            ng-model="term"
-           class="umb-search-field search-query"
+           class="umb-search-field search-query -full-width-input"
            placeholder="{{searchPlaceholderText}}"           
            focus-when="{{showSearch}}">
     <h4 ng-if="showSearch && searchFromName">

From ac75d8148db6a35e7b98c788a2d7bf2dfa4bf68f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 23 Mar 2017 11:46:51 +0100
Subject: [PATCH 10/10] fix color on tree header checkmark

---
 .../src/common/directives/components/tree/umbtree.directive.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 7a74716ea1..18080dbc38 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -305,7 +305,7 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat
                 scope.selectEnabledNodeClass = function (node) {
                     return node ?
                         node.selected ?
-                        'icon umb-tree-icon sprTree icon-check blue temporary' :
+                        'icon umb-tree-icon sprTree icon-check green temporary' :
                         '' :
                         '';
                 };