From 06db9d22237b35014c9b1c250e0634ad91314f12 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 15 Nov 2018 13:00:33 +0100
Subject: [PATCH] Reverts PR #3449 and #3493

---
 .../views/components/tabs/umb-tabs-nav.html   |  4 +-
 src/Umbraco.Web/Models/ContentEditing/Tab.cs  | 60 +++++++++----------
 .../Mapping/ContentPropertyModelMapper.cs     |  4 +-
 3 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
index f3e7279154..96c4adf783 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tabs/umb-tabs-nav.html
@@ -1,5 +1,5 @@
 <ul class="nav nav-tabs umb-nav-tabs">
-  <li data-element="tab-{{tab.alias}}" ng-class="{'tab-error': tabHasError}" class="{{tab.cssClass}}" ng-repeat="tab in model" val-tab>
-    <a data-toggle="tab" href="#tab{{tab.id}}{{idSuffix}}" title="{{tab.tooltip}}"><span>{{ tab.label }}</span></a>
+  <li data-element="tab-{{tab.alias}}" ng-class="{'tab-error': tabHasError}" ng-repeat="tab in model" val-tab>
+    <a data-toggle="tab" href="#tab{{tab.id}}{{idSuffix}}">{{ tab.label }}</a>
   </li>
 </ul>
diff --git a/src/Umbraco.Web/Models/ContentEditing/Tab.cs b/src/Umbraco.Web/Models/ContentEditing/Tab.cs
index b87c15543b..536fe31182 100644
--- a/src/Umbraco.Web/Models/ContentEditing/Tab.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/Tab.cs
@@ -1,33 +1,27 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Web.Models.ContentEditing
-{
-    /// <summary>
-    /// Represents a tab in the UI
-    /// </summary>
-    [DataContract(Name = "tab", Namespace = "")]
-    public class Tab<T>
-    {
-        [DataMember(Name = "id")]
-        public int Id { get; set; }
-
-        [DataMember(Name = "active")]
-        public bool IsActive { get; set; }
-
-        [DataMember(Name = "label")]
-        public string Label { get; set; }
-
-        [DataMember(Name = "alias")]
-        public string Alias { get; set; }
-
-        [DataMember(Name = "properties")]
-        public IEnumerable<T> Properties { get; set; }
-
-        [DataMember(Name = "cssClass")]
-        public string CssClass { get; set; }
-
-        [DataMember(Name = "tooltip")]
-        public string Tooltip { get; set; }
-    }
-}
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Web.Models.ContentEditing
+{
+    /// <summary>
+    /// Represents a tab in the UI
+    /// </summary>
+    [DataContract(Name = "tab", Namespace = "")]
+    public class Tab<T>
+    {
+        [DataMember(Name = "id")]
+        public int Id { get; set; }
+
+        [DataMember(Name = "active")]
+        public bool IsActive { get; set; }
+
+        [DataMember(Name = "label")]
+        public string Label { get; set; }
+
+        [DataMember(Name = "alias")]
+        public string Alias { get; set; }
+
+        [DataMember(Name = "properties")]
+        public IEnumerable<T> Properties { get; set; }
+    }
+}
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
index 8343aecbd0..f401832020 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
@@ -19,9 +19,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(tab => tab.Label, expression => expression.MapFrom(@group => @group.Name))
                 .ForMember(tab => tab.IsActive, expression => expression.UseValue(true))
                 .ForMember(tab => tab.Properties, expression => expression.Ignore())
-                .ForMember(tab => tab.Alias, expression => expression.Ignore())
-                .ForMember(tab => tab.CssClass, expression => expression.Ignore())
-                .ForMember(tab => tab.Tooltip, expression => expression.Ignore());
+                .ForMember(tab => tab.Alias, expression => expression.Ignore());
 
             //FROM Property TO ContentPropertyBasic
             config.CreateMap<Property, ContentPropertyBasic>()