From 0175bb0d9e0d35658fd19cc90d8b8099353556de Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 3 Sep 2013 14:24:26 +0200 Subject: [PATCH] IAction icons update --- .../src/common/services/util.service.js | 21 +++++++------------ src/Umbraco.Web.UI.Client/src/less/tree.less | 19 ++++++++--------- src/umbraco.cms/Actions/ActionCopy.cs | 2 +- src/umbraco.cms/Actions/ActionDelete.cs | 2 +- src/umbraco.cms/Actions/ActionMove.cs | 2 +- src/umbraco.cms/Actions/ActionNew.cs | 2 +- src/umbraco.cms/Actions/ActionNotify.cs | 2 +- src/umbraco.cms/Actions/ActionRights.cs | 2 +- .../Actions/ActionSendToTranslate.cs | 2 +- src/umbraco.cms/Actions/ActionSort.cs | 2 +- src/umbraco.cms/Actions/ActionToPublish.cs | 2 +- src/umbraco.cms/Actions/ActionUnPublish.cs | 2 +- 12 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js index 1127ee23ec..b311fb214c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js @@ -293,7 +293,7 @@ function iconHelper() { { 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", newIcon: "icon-folder" }, { oldIcon: ".sprTreeFolder_o", newIcon: "icon-folder-open" }, { oldIcon: ".sprTreeMediaFile", newIcon: "icon-music" }, { oldIcon: ".sprTreeMediaMovie", newIcon: "icon-movie" }, @@ -332,17 +332,7 @@ function iconHelper() { { 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" }, - { oldIcon: ".traysettings", newIcon: "traysettings" }, - { oldIcon: ".traydeveloper", newIcon: "traydeveloper" }, - { oldIcon: ".trayusers", newIcon: "trayusers" }, - { oldIcon: ".traymember", newIcon: "traymember" }, - { oldIcon: ".traytranslation", newIcon: "traytranslation" } + { oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" } ]; return { @@ -361,7 +351,12 @@ function iconHelper() { } return contentTypes; }, - + formatContentTypeIcons: function (contentTypes) { + for (var i = 0; i < contentTypes.length; i++) { + contentTypes[i].icon = this.convertFromLegacyIcon(contentTypes[i].icon); + } + return contentTypes; + }, /** If the icon is file based (i.e. it has a file path) */ isFileBasedIcon: function (icon) { //if it doesn't start with a '.' but contains one then we'll assume it's file based diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index 5b202844d9..c25a3e8888 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -257,22 +257,26 @@ li.root > div > a.umb-options { display: block; margin: 0px; } + .umb-actions-child li { display: block; width: 100%; } -.umb-actions-child a.action { +.umb-actions-child a { display: block; clear: both; text-decoration: none; width: 100%; + padding-left: 10px; } .umb-actions-child li .menu-label { font-size: 12px; margin-bottom: 10px; - color: #000 + color: #000; + margin-left: 20px; } + .umb-actions-child li a:hover { color: #fff; background-color: #2E8AEA @@ -291,16 +295,11 @@ li.root > div > a.umb-options { .umb-actions-child li a:hover .menuLabel small { text-decoration: none !important } -.umb-actions-child li img { - height: 55px; - width: 55px; - float: left; - margin-left: 25px -} + + .umb-actions-child i { - font-size: 24px; + font-size: 32px; vertical-align: top; - line-height: 36px } .umb-actions-child li.add { diff --git a/src/umbraco.cms/Actions/ActionCopy.cs b/src/umbraco.cms/Actions/ActionCopy.cs index e8d51a59ec..506c854475 100644 --- a/src/umbraco.cms/Actions/ActionCopy.cs +++ b/src/umbraco.cms/Actions/ActionCopy.cs @@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions get { - return "copy"; + return "documents"; } } diff --git a/src/umbraco.cms/Actions/ActionDelete.cs b/src/umbraco.cms/Actions/ActionDelete.cs index ce770ebf6a..68f9dbc463 100644 --- a/src/umbraco.cms/Actions/ActionDelete.cs +++ b/src/umbraco.cms/Actions/ActionDelete.cs @@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "remove"; + return "delete"; } } diff --git a/src/umbraco.cms/Actions/ActionMove.cs b/src/umbraco.cms/Actions/ActionMove.cs index 3835d262c2..fd642e6b68 100644 --- a/src/umbraco.cms/Actions/ActionMove.cs +++ b/src/umbraco.cms/Actions/ActionMove.cs @@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions get { - return "move"; + return "enter"; } } diff --git a/src/umbraco.cms/Actions/ActionNew.cs b/src/umbraco.cms/Actions/ActionNew.cs index 5a29d369a9..567015c45a 100644 --- a/src/umbraco.cms/Actions/ActionNew.cs +++ b/src/umbraco.cms/Actions/ActionNew.cs @@ -63,7 +63,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "plus"; + return "add"; } } diff --git a/src/umbraco.cms/Actions/ActionNotify.cs b/src/umbraco.cms/Actions/ActionNotify.cs index 3d7cced9c7..be1f32055d 100644 --- a/src/umbraco.cms/Actions/ActionNotify.cs +++ b/src/umbraco.cms/Actions/ActionNotify.cs @@ -67,7 +67,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "envelope"; + return "megaphone"; } } diff --git a/src/umbraco.cms/Actions/ActionRights.cs b/src/umbraco.cms/Actions/ActionRights.cs index 7ec2dd01cb..eb56829843 100644 --- a/src/umbraco.cms/Actions/ActionRights.cs +++ b/src/umbraco.cms/Actions/ActionRights.cs @@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions get { - return "group"; + return "vcard"; } } diff --git a/src/umbraco.cms/Actions/ActionSendToTranslate.cs b/src/umbraco.cms/Actions/ActionSendToTranslate.cs index 33e6f69a3b..cd7ec135cc 100644 --- a/src/umbraco.cms/Actions/ActionSendToTranslate.cs +++ b/src/umbraco.cms/Actions/ActionSendToTranslate.cs @@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "envelope-alt"; + return "chat"; } } diff --git a/src/umbraco.cms/Actions/ActionSort.cs b/src/umbraco.cms/Actions/ActionSort.cs index 276f9df18e..7ece758c28 100644 --- a/src/umbraco.cms/Actions/ActionSort.cs +++ b/src/umbraco.cms/Actions/ActionSort.cs @@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions get { - return "sort"; + return "navigation-vertical"; } } diff --git a/src/umbraco.cms/Actions/ActionToPublish.cs b/src/umbraco.cms/Actions/ActionToPublish.cs index 2c54301f1c..c2c6ee96c1 100644 --- a/src/umbraco.cms/Actions/ActionToPublish.cs +++ b/src/umbraco.cms/Actions/ActionToPublish.cs @@ -65,7 +65,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "mail-forward"; + return "outbox"; } } diff --git a/src/umbraco.cms/Actions/ActionUnPublish.cs b/src/umbraco.cms/Actions/ActionUnPublish.cs index ecd7f1c3b0..ed927915a0 100644 --- a/src/umbraco.cms/Actions/ActionUnPublish.cs +++ b/src/umbraco.cms/Actions/ActionUnPublish.cs @@ -68,7 +68,7 @@ namespace umbraco.BusinessLogic.Actions { get { - return "remove"; + return "circle-dotted"; } }