From c8f7ecabf485e4e5e26c829285923a93c7871088 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 30 Aug 2017 20:32:40 +0200 Subject: [PATCH] add avatar + set correct color on badges for history --- .../components/content/edit.controller.js | 120 ++++++++++++++---- .../src/less/components/umb-badge.less | 7 +- .../src/views/components/content/edit.html | 16 ++- 3 files changed, 111 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js index cb70ae148a..b320162b08 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js @@ -21,58 +21,109 @@ $scope.auditTrail = [ { - "name": "Zsolt Laszlo", "date": "03 December 2016 17:58PM", "action": "publish", - "description": "Content was performed" + "description": "Content was performed", + "user": { + "name": "Zsolt Laszlo", + "avatars": [] + } }, { - "name": "Mads Rasmussen", "date": "24 December 2016 20:18PM", - "action": "publish", - "description": "Content was performed" + "action": "unpublish", + "description": "Content was performed", + "user": { + "name": "Mads Rasmussen", + "avatars": [ + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=30", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=60", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=90", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=150", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=300" + ] + } }, { - "name": "Zsolt Laszlo", "date": "19 November 2016 21:11AM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Zsolt Laszlo", + "avatars": [] + } }, { - "name": "Mads Rasmussen", "date": "10 November 2016 10:41AM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Mads Rasmussen", + "avatars": [ + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=30", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=60", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=90", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=150", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=300" + ] + } }, { - "name": "Zsolt Laszlo", "date": "02 November 2016 03:44PM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Zsolt Laszlo", + "avatars": [] + } }, { - "name": "Mads Rasmussen", "date": "19 September 2016 18:21AM", "action": "publish", - "description": "Content was performed" + "description": "Content was performed", + "user": { + "name": "Mads Rasmussen", + "avatars": [ + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=30", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=60", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=90", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=150", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=300" + ] + } }, { - "name": "Mads Rasmussen", "date": "19 September 2016 08:51AM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Mads Rasmussen", + "avatars": [ + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=30", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=60", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=90", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=150", + "https://www.gravatar.com/avatar/bc196379513a5efe165b9e1571b8d5a8?d=404&s=300" + ] + } }, { - "name": "Zsolt Laszlo", "date": "11 September 2016 13:28AM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Zsolt Laszlo", + "avatars": [] + } }, { - "name": "Zsolt Laszlo", "date": "01 September 2016 23:19AM", - "action": "publish", - "description": "Content was performed" + "action": "save", + "description": "Content was performed", + "user": { + "name": "Zsolt Laszlo", + "avatars": [] + } } ]; @@ -122,6 +173,10 @@ }); } } + + // get the auditTrail + setAuditTrailActionColor($scope.auditTrail); + } /** Syncs the content item to it's tree node - this occurs on first load and after saving */ @@ -332,6 +387,21 @@ console.log("this is not the template"); }; + function setAuditTrailActionColor(auditTrail) { + angular.forEach(auditTrail, function (item) { + switch (item.action) { + case "publish": + item.actionColor = "success"; + break; + case "unpublish": + item.actionColor = "danger"; + break; + default: + item.actionColor = "gray"; + } + }); + } + } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less index 522b7564c1..015aa607c9 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less @@ -17,11 +17,16 @@ border-color: @turquoise; } -.umb-badge--seconday { +.umb-badge--secondary { background-color: @purple-washed; border-color: @purple; } +.umb-badge--gray { + background-color: @gray-10; + border-color: @gray-8; +} + .umb-badge--danger { background-color: @red-washed; border-color: @red; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html index 6f34ee40bb..3470ee48b3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html @@ -39,15 +39,19 @@
- + color="secondary" + size="xs" + name="{{item.user.name}}" + img-src="{{item.user.avatars[3]}}" + img-srcset="{{item.user.avatars[4]}} 2x, {{item.user.avatars[4]}} 3x"> +
-

{{ item.name }}

+

{{ item.user.name }}

{{ item.date }}

- + {{ item.action }}

{{ item.description }}