diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/FontAwesome.otf b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/FontAwesome.otf index 64049bf2e7..70125459f7 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/FontAwesome.otf and b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/FontAwesome.otf differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.eot b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.eot index 7d81019e4f..0662cb96bf 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.eot and b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.eot differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.svg b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.svg index ba0afe5ef6..2edb4ec34c 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.svg +++ b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.svg @@ -52,25 +52,25 @@ - - + + - - - + + + - - + + - + - + @@ -89,11 +89,11 @@ - + - + @@ -115,12 +115,12 @@ - - + + - - - + + + @@ -132,13 +132,13 @@ - + - + @@ -152,8 +152,8 @@ - - + + @@ -163,22 +163,22 @@ - + - - + + - + - - - - + + + + @@ -186,18 +186,18 @@ - + - + - + - + @@ -230,8 +230,8 @@ - - + + @@ -250,13 +250,13 @@ - + - - + + @@ -271,7 +271,7 @@ - + @@ -280,5 +280,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.ttf index d46172476a..d365924691 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.ttf and b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.ttf differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.woff index 3c89ae09b8..b9bd17e158 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.woff and b/src/Umbraco.Web.UI.Client/src/assets/fonts/fontawesome/fontawesome-webfont.woff differ diff --git a/src/Umbraco.Web.UI.Client/src/common/services/utill.service.js b/src/Umbraco.Web.UI.Client/src/common/services/utill.service.js index 5073eb984d..05d6dc2cbc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/utill.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/utill.service.js @@ -501,12 +501,51 @@ function iconHelper() { { oldIcon: ".sprTreeSettingDomain", newIcon: "icon-home" }, { oldIcon: ".sprTreeDoc", newIcon: "icon-file-alt" }, + { oldIcon: ".sprTreeDoc2", newIcon: "icon-file" }, + { oldIcon: ".sprTreeDoc3", newIcon: "icon-file-text" }, + { oldIcon: ".sprTreeDoc4", newIcon: "icon-file-text-alt" }, + { oldIcon: ".sprTreeDoc5", newIcon: "icon-book" }, + { oldIcon: ".sprTreeDocPic", newIcon: "icon-picture" }, { oldIcon: ".sprTreeFolder", newIcon: "icon-folder-close" }, { oldIcon: ".sprTreeFolder_o", newIcon: "icon-folder-open" }, { oldIcon: ".sprTreeMediaFile", newIcon: "icon-music" }, { oldIcon: ".sprTreeMediaMovie", newIcon: "icon-movie" }, { oldIcon: ".sprTreeMediaPhoto", newIcon: "icon-picture" }, + { oldIcon: ".sprTreeMember", newIcon: "icon-mail" }, + { oldIcon: ".sprTreeMemberGroup", newIcon: "icon-group" }, + { oldIcon: ".sprTreeMemberType", newIcon: "icon-group" }, + + { oldIcon: ".sprTreeNewsletter", newIcon: "icon-file-text-alt" }, + { oldIcon: ".sprTreePackage", newIcon: "icon-dropbox" }, + { oldIcon: ".sprTreeRepository", newIcon: "icon-github" }, + + //TODO: + /* + { oldIcon: ".sprTreeSettingAgent", newIcon: "" }, + { oldIcon: ".sprTreeSettingCss", newIcon: "" }, + { oldIcon: ".sprTreeSettingCssItem", newIcon: "" }, + { oldIcon: ".sprTreeSettingDataType", newIcon: "" }, + { oldIcon: ".sprTreeSettingDataTypeChild", newIcon: "" }, + { oldIcon: ".sprTreeSettingDomain", newIcon: "" }, + { oldIcon: ".sprTreeSettingLanguage", newIcon: "" }, + { oldIcon: ".sprTreeSettingScript", newIcon: "" }, + { oldIcon: ".sprTreeSettingTemplate", newIcon: "" }, + { oldIcon: ".sprTreeSettingXml", newIcon: "" }, + { oldIcon: ".sprTreeStatistik", newIcon: "" }, + { oldIcon: ".sprTreeUser", newIcon: "" }, + { oldIcon: ".sprTreeUserGroup", newIcon: "" }, + { oldIcon: ".sprTreeUserType", newIcon: "" }, + */ + + + { oldIcon: ".sprTreeDeveloperCacheItem", newIcon: "icon-box" }, + { oldIcon: ".sprTreeDeveloperCacheTypes", newIcon: "icon-box" }, + { oldIcon: ".sprTreeDeveloperMacro", newIcon: "icon-cogs" }, + { oldIcon: ".sprTreeDeveloperRegistry", newIcon: "icon-windows" }, + { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }, + + //tray icons { oldIcon: ".traycontent", newIcon: "traycontent" }, { oldIcon: ".traymedia", newIcon: "traymedia" }, diff --git a/src/Umbraco.Web.UI.Client/src/views/content/contentcreate.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/contentcreate.controller.js index f070823148..3fa2ea8c8d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/contentcreate.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/contentcreate.controller.js @@ -1,9 +1,12 @@ angular.module('umbraco') .controller("Umbraco.Editors.ContentCreateController", - function ($scope, $routeParams,contentTypeResource) { + function ($scope, $routeParams, contentTypeResource, iconHelper) { contentTypeResource.getAllowedTypes($scope.currentNode.id) - .then(function(data) { + .then(function (data) { + _.each(data, function(item) { + item.icon = iconHelper.convertFromLegacyIcon(item.icon); + }); $scope.allowedTypes = data; }); }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html index f9f43c86c9..04902c6bd9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html @@ -7,12 +7,13 @@
  • - + + - {{docType.name}} - - {{docType.description}} - + {{docType.name}} + + {{docType.description}} +
    • diff --git a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/FontAwesome.otf b/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/FontAwesome.otf deleted file mode 100644 index 64049bf2e7..0000000000 Binary files a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/FontAwesome.otf and /dev/null differ diff --git a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.eot b/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.eot deleted file mode 100644 index 7d81019e4f..0000000000 Binary files a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.eot and /dev/null differ diff --git a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.ttf b/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.ttf deleted file mode 100644 index d46172476a..0000000000 Binary files a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.woff b/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.woff deleted file mode 100644 index 3c89ae09b8..0000000000 Binary files a/src/Umbraco.Web.UI/umbraco/assets/fonts/fontawesome/fontawesome-webfont.woff and /dev/null differ diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs index cab401558a..ed355eff38 100644 --- a/src/Umbraco.Web/Editors/ContentTypeController.cs +++ b/src/Umbraco.Web/Editors/ContentTypeController.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Net; using System.Web.Http; +using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Models.Mapping; using Umbraco.Web.WebApi; using System.Linq; @@ -37,7 +38,7 @@ namespace Umbraco.Web.Editors /// Returns the allowed child content type objects for the content item id passed in /// /// - public IEnumerable GetAllowedChildren(int contentId) + public IEnumerable GetAllowedChildren(int contentId) { var contentItem = Services.ContentService.GetById(contentId); if (contentItem == null) @@ -52,50 +53,4 @@ namespace Umbraco.Web.Editors } } - - /// - /// An API controller used for dealing with content types - /// - public class MediaTypeApiController : UmbracoAuthorizedApiController - { - private readonly MediaTypeModelMapper _mediaTypeModelMapper; - - /// - /// Constructor - /// - public MediaTypeApiController() - : this(UmbracoContext.Current, new MediaTypeModelMapper(UmbracoContext.Current.Application)) - { - } - - /// - /// Constructor - /// - /// - /// - internal MediaTypeApiController(UmbracoContext umbracoContext, MediaTypeModelMapper mediaModelMapper) - : base(umbracoContext) - { - _mediaTypeModelMapper = mediaModelMapper; - } - - /// - /// Returns the allowed child content type objects for the content item id passed in - /// - /// - public IEnumerable GetAllowedChildren(int contentId) - { - var contentItem = Services.MediaService.GetById(contentId); - if (contentItem == null) - { - throw new HttpResponseException(HttpStatusCode.NotFound); - } - - - return contentItem.ContentType.AllowedContentTypes - .Select(x => Services.ContentTypeService.GetMediaType(x.Id.Value)) - .Select(x => _mediaTypeModelMapper.ToMediaTypeBasic(x)); - - } - } } \ No newline at end of file diff --git a/src/Umbraco.Web/Editors/MediaTypeApiController.cs b/src/Umbraco.Web/Editors/MediaTypeApiController.cs new file mode 100644 index 0000000000..dd285fe521 --- /dev/null +++ b/src/Umbraco.Web/Editors/MediaTypeApiController.cs @@ -0,0 +1,56 @@ +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Web.Http; +using Umbraco.Web.Models.ContentEditing; +using Umbraco.Web.Models.Mapping; +using Umbraco.Web.WebApi; + +namespace Umbraco.Web.Editors +{ + /// + /// An API controller used for dealing with content types + /// + public class MediaTypeApiController : UmbracoAuthorizedApiController + { + private readonly MediaTypeModelMapper _mediaTypeModelMapper; + + /// + /// Constructor + /// + public MediaTypeApiController() + : this(UmbracoContext.Current, new MediaTypeModelMapper(UmbracoContext.Current.Application)) + { + } + + /// + /// Constructor + /// + /// + /// + internal MediaTypeApiController(UmbracoContext umbracoContext, MediaTypeModelMapper mediaModelMapper) + : base(umbracoContext) + { + _mediaTypeModelMapper = mediaModelMapper; + } + + /// + /// Returns the allowed child content type objects for the content item id passed in + /// + /// + public IEnumerable GetAllowedChildren(int contentId) + { + var contentItem = Services.MediaService.GetById(contentId); + if (contentItem == null) + { + throw new HttpResponseException(HttpStatusCode.NotFound); + } + + + return contentItem.ContentType.AllowedContentTypes + .Select(x => Services.ContentTypeService.GetMediaType((int) x.Id.Value)) + .Select(x => _mediaTypeModelMapper.ToMediaTypeBasic(x)); + + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5f1c9e9a76..b48e25a4ee 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -298,6 +298,7 @@ +