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

add avatar + set correct color on badges for history

Browse Source
This commit is contained in:
Mads Rasmussen
2017-08-30 20:32:40 +02:00
parent 9137249510
commit c8f7ecabf4
3 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
View File

@@ -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";
}
});
}
}

7
src/Umbraco.Web.UI.Client/src/less/components/umb-badge.less
View File

@@ -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;

16
src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
View File

@@ -39,15 +39,19 @@
<div class="history-item" ng-repeat="item in auditTrail">
<div class="history-row">
<umb-avatar
color="secondary"
size="xs"
name="zsolt">
</umb-avatar>
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">
</umb-avatar>
<div class="name-date-container">
<h1>{{ item.name }}</h1>
<h1>{{ item.user.name }}</h1>
<h2>{{ item.date }}</h2>
</div>
<umb-badge size="s" color="success">
<umb-badge
size="s"
color="{{item.actionColor}}">
{{ item.action }}
</umb-badge>
<h4>{{ item.description }}</h4>