From e126d5a65b2e7a5483b01c74a3a893402ac6a93c Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 16 Jul 2015 13:52:55 +0200
Subject: [PATCH 1/4] Add document type icons to the items

This way it's easier to tell the items apart when they're all collapsed
---
 .../Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css  | 6 ++++++
 .../NestedContent/Js/nestedcontent.controllers.js           | 5 +++++
 .../UI/App_Plugins/NestedContent/Views/nestedcontent.html   | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
index 1d9a54a..d9f96cf 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
@@ -53,6 +53,12 @@
     line-height: 20px;
 }
 
+.nested-content__heading i 
+{
+    vertical-align: text-top;
+    color: #999; /* same icon color as the icons in the item type picker */
+}
+
 .nested-content__icons 
 {
     margin: -6px 0;
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
index 717c436..447e54f 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
@@ -176,6 +176,11 @@ angular.module("umbraco").controller("Our.Umbraco.NestedContent.Controllers.Nest
             return name;
         };
 
+        $scope.getIcon = function (idx) {
+            var scaffold = $scope.getScaffold($scope.model.value[idx].ncContentTypeAlias);
+            return scaffold && scaffold.icon && scaffold.icon !== ".sprTreeFolder" ? scaffold.icon : "icon-folder";
+        }
+
         $scope.sortableOptions = {
             axis: 'y',
             cursor: "move",
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
index 2f58dd1..0ca3c9a 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
@@ -7,7 +7,7 @@
 
                 <div class="nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">
                 
-                    <div class="nested-content__heading" ng-bind="$parent.getName($index)"></div>
+                    <div class="nested-content__heading"><i class="icon" ng-class="$parent.getIcon($index)"></i> <span ng-bind="$parent.getName($index)"></span></div>
                 
                     <div class="nested-content__icons">
                         <a class="nested-content__icon nested-content__icon--edit"  ng-class="{ 'nested-content__icon--active' : $parent.currentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" prevent-default>

From eee7479314aec3cfdebbfc6410f49945c7a8e9bd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 17 Jul 2015 11:08:37 +0200
Subject: [PATCH 2/4] Add a bit more spacing between icon and heading

---
 .../Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
index d9f96cf..5f53520 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
@@ -57,6 +57,7 @@
 {
     vertical-align: text-top;
     color: #999; /* same icon color as the icons in the item type picker */
+    margin-right: 6px;
 }
 
 .nested-content__icons 

From 0cd6aa0fa66060f9d3d1c62697cde9fd4993b697 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Fri, 17 Jul 2015 11:22:06 +0200
Subject: [PATCH 3/4] Conditionally hide icons

Hide icons by means of prevalue configuration.
---
 .../PropertyEditors/NestedContentPropertyEditor.cs             | 3 +++
 .../Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css     | 2 +-
 .../App_Plugins/NestedContent/Js/nestedcontent.controllers.js  | 2 ++
 .../Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html  | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs b/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
index a141c10..16c19c0 100644
--- a/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
@@ -66,6 +66,9 @@ internal class NestedContentPreValueEditor : PreValueEditor
             [PreValueField("confirmDeletes", "Confirm Deletes", "boolean", Description = "Set whether item deletions should require confirming.")]
             public string ConfirmDeletes { get; set; }
 
+            [PreValueField("hideIcons", "Hide Icons", "boolean", Description = "Set whether to hide the item icons in the list.")]
+            public string HideIcons { get; set; }
+
             [PreValueField("hideLabel", "Hide Label", "boolean", Description = "Set whether to hide the editor label and have the list take up the full width of the editor window.")]
             public string HideLabel { get; set; }
 
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
index 5f53520..53fd757 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Css/nestedcontent.css
@@ -57,7 +57,7 @@
 {
     vertical-align: text-top;
     color: #999; /* same icon color as the icons in the item type picker */
-    margin-right: 6px;
+    margin-right: 10px;
 }
 
 .nested-content__icons 
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
index 447e54f..b441e6d 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
@@ -73,6 +73,8 @@ angular.module("umbraco").controller("Our.Umbraco.NestedContent.Controllers.Nest
 
         $scope.singleMode = $scope.minItems == 1 && $scope.maxItems == 1;
 
+        $scope.hideIcons = $scope.model.config.hideIcons == true;
+
         $scope.overlayMenu = {
             show: false,
             style: {}
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
index 0ca3c9a..6609c62 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
@@ -7,7 +7,7 @@
 
                 <div class="nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">
                 
-                    <div class="nested-content__heading"><i class="icon" ng-class="$parent.getIcon($index)"></i> <span ng-bind="$parent.getName($index)"></span></div>
+                    <div class="nested-content__heading"><i ng-if="!hideIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span ng-bind="$parent.getName($index)"></span></div>
                 
                     <div class="nested-content__icons">
                         <a class="nested-content__icon nested-content__icon--edit"  ng-class="{ 'nested-content__icon--active' : $parent.currentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" prevent-default>

From 25544a5b12df48d65bcd85b1c78f4352243a0093 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Mon, 20 Jul 2015 12:37:45 +0200
Subject: [PATCH 4/4] Change "hide icons" to "show icons"

---
 .../PropertyEditors/NestedContentPropertyEditor.cs         | 7 ++++---
 .../NestedContent/Js/nestedcontent.controllers.js          | 2 +-
 .../UI/App_Plugins/NestedContent/Views/nestedcontent.html  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs b/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
index 16c19c0..056b07f 100644
--- a/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Our.Umbraco.NestedContent/PropertyEditors/NestedContentPropertyEditor.cs
@@ -39,7 +39,8 @@ public NestedContentPropertyEditor()
                 {NestedContentPreValueEditor.ContentTypesPreValueKey, ""},
                 {"minItems", 0},
                 {"maxItems", 0},
-                {"confirmDeletes", 1}
+                {"confirmDeletes", "1"},
+                {"showIcons", "1"}
             };
         }
 
@@ -66,8 +67,8 @@ internal class NestedContentPreValueEditor : PreValueEditor
             [PreValueField("confirmDeletes", "Confirm Deletes", "boolean", Description = "Set whether item deletions should require confirming.")]
             public string ConfirmDeletes { get; set; }
 
-            [PreValueField("hideIcons", "Hide Icons", "boolean", Description = "Set whether to hide the item icons in the list.")]
-            public string HideIcons { get; set; }
+            [PreValueField("showIcons", "Show Icons", "boolean", Description = "Set whether to show the item icons in the list.")]
+            public string ShowIcons { get; set; }
 
             [PreValueField("hideLabel", "Hide Label", "boolean", Description = "Set whether to hide the editor label and have the list take up the full width of the editor window.")]
             public string HideLabel { get; set; }
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
index b441e6d..a00887f 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
@@ -73,7 +73,7 @@ angular.module("umbraco").controller("Our.Umbraco.NestedContent.Controllers.Nest
 
         $scope.singleMode = $scope.minItems == 1 && $scope.maxItems == 1;
 
-        $scope.hideIcons = $scope.model.config.hideIcons == true;
+        $scope.showIcons = $scope.model.config.showIcons || true;
 
         $scope.overlayMenu = {
             show: false,
diff --git a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
index 6609c62..9966bd4 100644
--- a/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
+++ b/src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
@@ -7,7 +7,7 @@
 
                 <div class="nested-content__header-bar" ng-click="$parent.editNode($index)" ng-hide="$parent.singleMode">
                 
-                    <div class="nested-content__heading"><i ng-if="!hideIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span ng-bind="$parent.getName($index)"></span></div>
+                    <div class="nested-content__heading"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span ng-bind="$parent.getName($index)"></span></div>
                 
                     <div class="nested-content__icons">
                         <a class="nested-content__icon nested-content__icon--edit"  ng-class="{ 'nested-content__icon--active' : $parent.currentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" prevent-default>