diff --git a/build/NuSpecs/tools/applications.config.install.xdt b/build/NuSpecs/tools/applications.config.install.xdt
index f4a0060150..5c05b2b4e9 100644
--- a/build/NuSpecs/tools/applications.config.install.xdt
+++ b/build/NuSpecs/tools/applications.config.install.xdt
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Core/Models/Section.cs b/src/Umbraco.Core/Models/Section.cs
index cbd9dfe7dc..b9eda285b0 100644
--- a/src/Umbraco.Core/Models/Section.cs
+++ b/src/Umbraco.Core/Models/Section.cs
@@ -5,11 +5,10 @@
///
public class Section
{
- public Section(string name, string @alias, string icon, int sortOrder)
+ public Section(string name, string @alias, int sortOrder)
{
Name = name;
Alias = alias;
- Icon = icon;
SortOrder = sortOrder;
}
@@ -20,7 +19,6 @@
public string Name { get; set; }
public string Alias { get; set; }
- public string Icon { get; set; }
public int SortOrder { get; set; }
}
}
diff --git a/src/Umbraco.Web.UI/config/applications.Release.config b/src/Umbraco.Web.UI/config/applications.Release.config
index 7f88f58801..5c8dee3b8a 100644
--- a/src/Umbraco.Web.UI/config/applications.Release.config
+++ b/src/Umbraco.Web.UI/config/applications.Release.config
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI/config/applications.config b/src/Umbraco.Web.UI/config/applications.config
index 268d94a255..5c8dee3b8a 100644
--- a/src/Umbraco.Web.UI/config/applications.config
+++ b/src/Umbraco.Web.UI/config/applications.config
@@ -1,11 +1,11 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web/Models/Trees/ApplicationAttribute.cs b/src/Umbraco.Web/Models/Trees/ApplicationAttribute.cs
index 221346cd23..65fc4ed6f3 100644
--- a/src/Umbraco.Web/Models/Trees/ApplicationAttribute.cs
+++ b/src/Umbraco.Web/Models/Trees/ApplicationAttribute.cs
@@ -13,22 +13,18 @@ namespace Umbraco.Web.Models.Trees
///
/// The alias.
/// The name.
- /// The icon.
/// The sort order.
public ApplicationAttribute(string alias,
string name,
- string icon,
int sortOrder = 0)
{
Alias = alias;
Name = name;
- Icon = icon;
SortOrder = sortOrder;
}
public string Alias { get; private set; }
public string Name { get; private set; }
- public string Icon { get; private set; }
public int SortOrder { get; private set; }
}
}
diff --git a/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs b/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs
index 67b542e840..aa8e0cfda6 100644
--- a/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs
+++ b/src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs
@@ -7,31 +7,31 @@ namespace Umbraco.Web.Models.Trees
// the application.config. On app startup, Umbraco will look for any
// unregistered classes with an ApplicationAttribute and add them to the cache
- [Application(Constants.Applications.Content, "Content", ".traycontent")]
+ [Application(Constants.Applications.Content, "Content")]
public class ContentApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Media, "Media", ".traymedia", sortOrder: 1)]
+ [Application(Constants.Applications.Media, "Media", sortOrder: 1)]
public class MediaApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Settings, "Settings", ".traysettings", sortOrder: 2)]
+ [Application(Constants.Applications.Settings, "Settings", sortOrder: 2)]
public class SettingsApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Packages, "Packages", ".traydeveloper", sortOrder: 3)]
+ [Application(Constants.Applications.Packages, "Packages", sortOrder: 3)]
public class PackagesApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Users, "Users", ".trayusers", sortOrder: 4)]
+ [Application(Constants.Applications.Users, "Users", sortOrder: 4)]
public class UsersApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Members, "Members", ".traymember", sortOrder: 5)]
+ [Application(Constants.Applications.Members, "Members", sortOrder: 5)]
public class MembersApplicationDefinition : IApplication
{ }
- [Application(Constants.Applications.Translation, "Translation", ".traytranslation", sortOrder: 6)]
+ [Application(Constants.Applications.Translation, "Translation", sortOrder: 6)]
public class TranslationApplicationDefinition : IApplication
{ }
}
diff --git a/src/Umbraco.Web/Services/SectionService.cs b/src/Umbraco.Web/Services/SectionService.cs
index 411d122d49..ff8279a411 100644
--- a/src/Umbraco.Web/Services/SectionService.cs
+++ b/src/Umbraco.Web/Services/SectionService.cs
@@ -92,7 +92,6 @@ namespace Umbraco.Web.Services
doc.Root.Add(new XElement("add",
new XAttribute("alias", attr.Alias),
new XAttribute("name", attr.Name),
- new XAttribute("icon", attr.Icon),
new XAttribute("sortOrder", attr.SortOrder)));
count++;
}
@@ -201,7 +200,7 @@ namespace Umbraco.Web.Services
}, true);
//raise event
- OnNew(new Section(name, alias, icon, sortOrder), new EventArgs());
+ OnNew(new Section(name, alias, sortOrder), new EventArgs());
}
}
@@ -255,7 +254,6 @@ namespace Umbraco.Web.Services
var sortOrderAttr = addElement.Attribute("sortOrder");
tmp.Add(new Section(addElement.Attribute("name").Value,
addElement.Attribute("alias").Value,
- addElement.Attribute("icon").Value,
sortOrderAttr != null ? Convert.ToInt32(sortOrderAttr.Value) : 0));
}
return false;
@@ -300,7 +298,7 @@ namespace Umbraco.Web.Services
//we need to interrogate the attributes for the data. Would be better to have a base class that contains
//metadata populated by the attribute. Oh well i guess.
var attrs = types.Select(x => x.GetCustomAttributes(false).Single());
- return Enumerable.ToArray(attrs.Select(x => new Section(x.Name, x.Alias, x.Icon, x.SortOrder)));
+ return Enumerable.ToArray(attrs.Select(x => new Section(x.Name, x.Alias, x.SortOrder)));
});
}