From 1c554a87708d007a8fbfd7dcdc0ec4d2c4ef720b Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 7 Feb 2019 17:14:07 +0100
Subject: [PATCH] Add generic section icon in section picker + clean up legacy
 section icon stuff

---
 .../application/sectionicon.directive.js      | 30 -------------------
 .../src/less/helveticons.less                 |  3 ++
 .../sectionpicker/sectionpicker.controller.js |  2 +-
 .../src/views/users/group.controller.js       |  2 +-
 .../Models/ContentEditing/Section.cs          |  3 --
 .../Models/Mapping/SectionMapperProfile.cs    |  1 -
 6 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/components/application/sectionicon.directive.js

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/sectionicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/sectionicon.directive.js
deleted file mode 100644
index 28b6620aeb..0000000000
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/sectionicon.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-angular.module("umbraco.directives")
-.directive('sectionIcon', function ($compile, iconHelper) {
-    return {
-        restrict: 'E',
-        replace: true,
-
-        link: function (scope, element, attrs) {
-
-            var icon = attrs.icon;
-
-            if (iconHelper.isLegacyIcon(icon)) {
-                //its a known legacy icon, convert to a new one
-                element.html("<i class='" + iconHelper.convertFromLegacyIcon(icon) + "'></i>");
-            }
-            else if (iconHelper.isFileBasedIcon(icon)) {
-                var convert = iconHelper.convertFromLegacyImage(icon);
-                if(convert){
-                    element.html("<i class='icon-section " + convert + "'></i>");
-                }else{
-                    element.html("<img class='icon-section' src='images/tray/" + icon + "'>");
-                }
-                //it's a file, normally legacy so look in the icon tray images
-            }
-            else {
-                //it's normal
-                element.html("<i class='icon-section " + icon + "'></i>");
-            }
-        }
-    };
-});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/helveticons.less b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
index 1083a490e0..82663270e9 100644
--- a/src/Umbraco.Web.UI.Client/src/less/helveticons.less
+++ b/src/Umbraco.Web.UI.Client/src/less/helveticons.less
@@ -1875,3 +1875,6 @@ i.small{
 .icon-alert-alt:before {
 	content: "\e25d";
 }
+.icon-section:before {
+    content: "\e24f";
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
index d6e8978e38..55d7a75000 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/sectionpicker/sectionpicker.controller.js
@@ -78,7 +78,7 @@
 
         function setSectionIcon(sections) {
             angular.forEach(sections, function(section) {
-                section.icon = "icon-section " + section.cssclass;
+                section.icon = "icon-section";
             });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
index a9d9f5d4e4..f37cc95174 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
@@ -302,7 +302,7 @@
 
         function setSectionIcon(sections) {
             angular.forEach(sections, function (section) {
-                section.icon = "icon-section " + section.cssclass;
+                section.icon = "icon-section";
             });
         }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/Section.cs b/src/Umbraco.Web/Models/ContentEditing/Section.cs
index 352fb783a0..b51bbf249f 100644
--- a/src/Umbraco.Web/Models/ContentEditing/Section.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/Section.cs
@@ -11,9 +11,6 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "name")]
         public string Name { get; set; }
 
-        [DataMember(Name = "cssclass")]
-        public string Icon { get; set; }
-
         [DataMember(Name = "alias")]
         public string Alias { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs b/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs
index c82e2881b9..61dd8dcadc 100644
--- a/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs
+++ b/src/Umbraco.Web/Models/Mapping/SectionMapperProfile.cs
@@ -12,7 +12,6 @@ namespace Umbraco.Web.Models.Mapping
         {
             CreateMap<ISection, Section>()
                 .ForMember(dest => dest.RoutePath, opt => opt.Ignore())
-                .ForMember(dest => dest.Icon, opt => opt.Ignore())
                 .ForMember(dest => dest.Name, opt => opt.MapFrom(src => textService.Localize("sections/" + src.Alias, (IDictionary<string, string>)null)))
                 .ReverseMap(); //backwards too!
         }