Skip to content
Snippets Groups Projects
Commit 512dc163 authored by James Allen's avatar James Allen
Browse files

Improve the description above each change

parent d06a93fd
No related branches found
No related tags found
No related merge requests found
......@@ -21,6 +21,8 @@ define [
return hue
name: () ->
if window.user.id == @get("id")
return "you"
parts = []
first_name = @get("first_name")
if first_name? and first_name.length > 0
......
......@@ -128,7 +128,7 @@ define [
modelView = {
hue: @model.get("user").hue()
date: moment(parseInt(@model.get("end_ts"), 10)).calendar()
name: @model.get("user").get("first_name") + " " + @model.get("user").get("last_name")
name: @model.get("user").name()
}
# modelView.start_ts = util.formatDate(modelView.start_ts)
# modelView.end_ts = util.formatDate(modelView.end_ts)
......
......@@ -85,9 +85,10 @@ define [
"""
tag = "Deleted by #{entry.meta.user.name()}"
tag += " on #{entry.meta.end_ts}"
date = moment(parseInt(entry.meta.end_ts, 10)).format("Do MMM YYYY, h:mm:ss a")
tag += " on #{date}"
@_addNameTag session, id, range, tag, """
background-color : hsl(#{hue}, 70%, 85%);
background-color : hsl(#{hue}, 70%, 95%);
"""
_addMarkerWithCustomStyle: (session, markerLayer, range, klass, foreground, style) ->
......@@ -105,7 +106,7 @@ define [
id: id
startRange = new Range.Range(
range.start.row, range.start.column
range.start.row, session.getScreenLastRowColumn(range.start.row)
range.start.row, range.start.column + 1
)
session.addMarker startRange, "change-name-marker", (html, range, left, top, config) ->
html.push """
......@@ -121,7 +122,7 @@ define [
<div
class="name" style="
display: none;
bottom: #{config.lineHeight + 2}px;
bottom: #{config.lineHeight + 3}px;
#{style}
">#{content}</div>
</div>
......
......@@ -48,6 +48,7 @@
padding: 2px 6px;
.border-radius(3px 3px 3px 3px);
position: absolute;
border: 1px solid #999;
left: 0;
}
}
......@@ -79,6 +80,7 @@
.change-name {
font-size: 0.9em;
color: #666;
text-transform: capitalize;
}
.color-square {
display: inline-block;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment