From 5c1502c8066a6c49f3047e0942e432488ff2b0a5 Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@umbraco.com>
Date: Fri, 12 Feb 2016 10:13:30 +0100
Subject: [PATCH] Removes umb-control-group when no icons displayed

---
 .../src/views/common/dialogs/iconpicker.html    | 17 ++++++++---------
 .../common/overlays/iconpicker/iconpicker.html  | 15 +++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
index 314bfe85e1..260d8ff85c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html
@@ -25,9 +25,9 @@
         	</select>
         </div>
 
-        <div class="umb-loader" ng-hide="icons"></div>
+        <umb-load-indicator ng-if="loading"></umb-load-indicator>
 
-        <div class="umb-control-group">
+        <div class="umb-control-group" ng-show="!loading">
 	        <ul class="umb-iconpicker" ng-class="color" ng-show="icons">
 		        <li class="umb-iconpicker-item" ng-repeat="icon in filtered = (icons | filter: searchTerm) track by $id(icon)">
 				    <a href="#" title="{{icon}}" ng-click="submitClass(icon)" prevent-default>
@@ -35,14 +35,13 @@
 		            </a>
 		        </li>
 		    </ul>
-
-			<umb-empty-state
-				ng-if="filtered.length === 0"
-				position="center">
-				<localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
-			</umb-empty-state>
-
 		</div>
+
+		<umb-empty-state
+			ng-if="filtered.length === 0"
+			position="center">
+			<localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
+		</umb-empty-state>
 	</div>
 
 	<div class="umb-panel-footer" >
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
index 30bc1f9b9a..83a02a4504 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
@@ -38,7 +38,7 @@
 
     <umb-load-indicator ng-if="loading"></umb-load-indicator>
 
-    <div class="umb-control-group" ng-show="!loading">
+    <div class="umb-control-group" ng-show="!loading && filtered.length > 0 ">
         <ul class="umb-iconpicker" ng-class="color" ng-show="icons">
             <li class="umb-iconpicker-item" ng-repeat="icon in filtered = (icons | filter: searchTerm) track by $id(icon)">
                 <a href="#" title="{{icon}}" ng-click="selectIcon(icon, color)" prevent-default>
@@ -46,12 +46,11 @@
                 </a>
             </li>
         </ul>
-
-        <umb-empty-state
-            ng-if="filtered.length === 0"
-            position="center">
-            <localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
-        </umb-empty-state>
-
     </div>
+
+    <umb-empty-state
+        ng-if="filtered.length === 0"
+        position="center">
+        <localize key="defaultdialogs_noIconsFound">No icons were found.</localize>
+    </umb-empty-state>
 </div>