yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove sections icons - not needed anymore

Browse Source
This commit is contained in:
elitsa
2018-10-08 10:00:52 +02:00
parent 8fdee9af85
commit e2acc8b447
7 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/NuSpecs/tools/applications.config.install.xdt
View File

@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<applications xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<add alias="content" icon="traycontent" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="media" icon="traymedia" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="settings" icon="traysettings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="developer" icon="traydeveloper" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="users" icon="trayusers" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="member" icon="traymember" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
<add alias="translation" icon="traytranslation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
</applications>
<add alias="content" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="media" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="settings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="developer" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="users" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="member" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
<add alias="forms" name="Forms" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
<add alias="translation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
</applications>

4
src/Umbraco.Core/Models/Section.cs
View File

@@ -5,11 +5,10 @@
/// </summary>
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; }
}
}

18
src/Umbraco.Web.UI/config/applications.Release.config
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<applications>
<add alias="content" name="Content" icon="traycontent" sortOrder="0" />
<add alias="media" name="Media" icon="traymedia" sortOrder="1" />
<add alias="settings" name="Settings" icon="traysettings" sortOrder="2" />
<add alias="developer" name="Developer" icon="traydeveloper" sortOrder="3" />
<add alias="users" name="Users" icon="trayuser" sortOrder="4" />
<add alias="member" name="Members" icon="traymember" sortOrder="5" />
<add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" />
<add alias="translation" name="Translation" icon="traytranslation" sortOrder="7" />
</applications>
<add alias="content" name="Content" sortOrder="0" />
<add alias="media" name="Media" sortOrder="1" />
<add alias="settings" name="Settings" sortOrder="2" />
<add alias="packages" name="Packages" sortOrder="3" />
<add alias="users" name="Users" sortOrder="4" />
<add alias="member" name="Members" sortOrder="5" />
<add alias="forms" name="Forms" sortOrder="6" />
<add alias="translation" name="Translation" sortOrder="7" />
</applications>

16
src/Umbraco.Web.UI/config/applications.config
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<applications>
<add alias="content" name="Content" icon="traycontent" sortOrder="0" />
<add alias="media" name="Media" icon="traymedia" sortOrder="1" />
<add alias="settings" name="Settings" icon="traysettings" sortOrder="2" />
<add alias="packages" name="Packages" icon="traydeveloper" sortOrder="3" />
<add alias="users" name="Users" icon="trayuser" sortOrder="4" />
<add alias="member" name="Members" icon="traymember" sortOrder="5" />
<add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" />
<add alias="translation" name="Translation" icon="traytranslation" sortOrder="7" />
<add alias="content" name="Content" sortOrder="0" />
<add alias="media" name="Media" sortOrder="1" />
<add alias="settings" name="Settings" sortOrder="2" />
<add alias="packages" name="Packages" sortOrder="3" />
<add alias="users" name="Users" sortOrder="4" />
<add alias="member" name="Members" sortOrder="5" />
<add alias="forms" name="Forms" sortOrder="6" />
<add alias="translation" name="Translation" sortOrder="7" />
</applications>

4
src/Umbraco.Web/Models/Trees/ApplicationAttribute.cs
View File

@@ -13,22 +13,18 @@ namespace Umbraco.Web.Models.Trees
/// </summary>
/// <param name="alias">The alias.</param>
/// <param name="name">The name.</param>
/// <param name="icon">The icon.</param>
/// <param name="sortOrder">The sort order.</param>
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; }
}
}

14
src/Umbraco.Web/Models/Trees/ApplicationDefinitions.cs
View File

@@ -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
{ }
}

6
src/Umbraco.Web/Services/SectionService.cs
View File

@@ -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<ApplicationAttribute>(false).Single());
return Enumerable.ToArray<Section>(attrs.Select(x => new Section(x.Name, x.Alias, x.Icon, x.SortOrder)));
return Enumerable.ToArray<Section>(attrs.Select(x => new Section(x.Name, x.Alias, x.SortOrder)));
});
}