From 1901fbb6edd538236e2ee3bda2a368464130bcda Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 9 Feb 2017 10:42:15 +0100
Subject: [PATCH] add markup for member picker and content picker

---
 .../overlays/contentpicker/contentpicker.html | 70 +++++++++++--------
 .../overlays/memberpicker/memberpicker.html   | 69 ++++++++++--------
 2 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
index c22b539b38..43eab532d4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
@@ -1,34 +1,48 @@
 <div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('content')">
 
-    <div class="umb-control-group">
-        <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="content">
-        </umb-tree-search-box>
+    <div ng-hide="miniListView">
+
+        <div class="umb-control-group">
+            <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="content">
+            </umb-tree-search-box>
+        </div>
+
+        <umb-tree-search-results
+            ng-if="searchInfo.showSearch"
+            results="searchInfo.results"
+            select-result-callback="selectResult">
+        </umb-tree-search-results>
+
+        <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+            <umb-tree
+                section="content"
+                treealias="content"
+                hideheader="{{hideHeader}}"
+                hideoptions="true"
+                isdialog="true"
+                customtreeparams="{{customTreeParams}}"
+                eventhandler="dialogTreeEventHandler"
+                enablelistviewsearch="true"
+                enablelistviewexpand="true"
+                enablecheckboxes="{{multiPicker}}">
+            </umb-tree>
+        </div>
+
     </div>
 
-    <umb-tree-search-results
-        ng-if="searchInfo.showSearch"
-        results="searchInfo.results"
-        select-result-callback="selectResult">
-    </umb-tree-search-results>
-
-    <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
-        <umb-tree
-            section="content"
-            treealias="content"
-            hideheader="{{hideHeader}}"
-            hideoptions="true"
-            isdialog="true"
-            customtreeparams="{{customTreeParams}}"
-            eventhandler="dialogTreeEventHandler"
-            enablelistviewsearch="true"
-            enablecheckboxes="{{multiPicker}}">
-        </umb-tree>
-    </div>
+    <umb-mini-list-view
+        ng-if="miniListView"
+        node="miniListView"
+        entity-type="{{entityType}}"
+        start-node-id="model.startNodeId"
+        on-select="selectListViewNode(node)"
+        on-close="closeMiniListView()">
+    </umb-mini-list-view>
 
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
index e4a8d36263..00475dddfe 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
@@ -1,34 +1,47 @@
 <div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('member')">
 
-   <div class="umb-control-group">
-      <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="member">
-      </umb-tree-search-box>
-   </div>
+    <div ng-hide="miniListView">
 
-   <umb-tree-search-results
-      ng-if="searchInfo.showSearch"
-      results="searchInfo.results"
-      select-result-callback="selectResult">
-   </umb-tree-search-results>
+        <div class="umb-control-group">
+            <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="member">
+            </umb-tree-search-box>
+        </div>
 
-   <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
-      <umb-tree
-         section="member"
-         treealias="member"
-         hideheader="{{hideHeader}}"
-         hideoptions="true"
-         isdialog="true"
-         customtreeparams="{{customTreeParams}}"
-         eventhandler="dialogTreeEventHandler"
-         enablelistviewsearch="true"
-         enablecheckboxes="{{multiPicker}}">
-      </umb-tree>
-   </div>
+        <umb-tree-search-results
+            ng-if="searchInfo.showSearch"
+            results="searchInfo.results"
+            select-result-callback="selectResult">
+        </umb-tree-search-results>
+   
+        <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+            <umb-tree
+                section="member"
+                treealias="member"
+                hideheader="{{hideHeader}}"
+                hideoptions="true"
+                isdialog="true"
+                customtreeparams="{{customTreeParams}}"
+                eventhandler="dialogTreeEventHandler"
+                enablelistviewsearch="true"
+                enablelistviewexpand="true"
+                enablecheckboxes="{{multiPicker}}">
+            </umb-tree>
+        </div>
+    </div>
+
+    <umb-mini-list-view
+        ng-if="miniListView"
+        node="miniListView"
+        entity-type="{{entityType}}"
+        start-node-id="model.startNodeId"
+        on-select="selectListViewNode(node)"
+        on-close="closeMiniListView()">
+    </umb-mini-list-view>
 
 </div>