github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve the description above each change

Browse source
This commit is contained in:
James Allen 2014-03-07 12:54:08 +00:00
parent ebe4e5b1d8
commit e0cd9ba163
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/public/coffee/models/User.coffee
View file

@ -21,6 +21,8 @@ define [
return hue return hue
name: () -> name: () ->
if window.user.id == @get("id")
return "you"
parts = [] parts = []
first_name = @get("first_name") first_name = @get("first_name")
if first_name? and first_name.length > 0 if first_name? and first_name.length > 0

2
services/web/public/coffee/track-changes/ChangeListView.coffee
View file

@ -128,7 +128,7 @@ define [
modelView = { modelView = {
hue: @model.get("user").hue() hue: @model.get("user").hue()
date: moment(parseInt(@model.get("end_ts"), 10)).calendar() 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.start_ts = util.formatDate(modelView.start_ts)
# modelView.end_ts = util.formatDate(modelView.end_ts) # modelView.end_ts = util.formatDate(modelView.end_ts)

9
services/web/public/coffee/track-changes/DiffView.coffee
View file

@ -85,9 +85,10 @@ define [
""" """
tag = "Deleted by #{entry.meta.user.name()}" 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, """ @_addNameTag session, id, range, tag, """
background-color : hsl(#{hue}, 70%, 85%); background-color : hsl(#{hue}, 70%, 95%);
""" """
_addMarkerWithCustomStyle: (session, markerLayer, range, klass, foreground, style) -> _addMarkerWithCustomStyle: (session, markerLayer, range, klass, foreground, style) ->
@ -105,7 +106,7 @@ define [
id: id id: id
startRange = new Range.Range( startRange = new Range.Range(
range.start.row, range.start.column 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) -> session.addMarker startRange, "change-name-marker", (html, range, left, top, config) ->
html.push """ html.push """
@ -121,7 +122,7 @@ define [
<div <div
class="name" style=" class="name" style="
display: none; display: none;
bottom: #{config.lineHeight + 2}px; bottom: #{config.lineHeight + 3}px;
#{style} #{style}
">#{content}</div> ">#{content}</div>
</div> </div>

2
services/web/public/stylesheets/less/trackchanges.less
View file

@ -48,6 +48,7 @@
padding: 2px 6px; padding: 2px 6px;
.border-radius(3px 3px 3px 3px); .border-radius(3px 3px 3px 3px);
position: absolute; position: absolute;
border: 1px solid #999;
left: 0; left: 0;
} }
} }
@ -79,6 +80,7 @@
.change-name { .change-name {
font-size: 0.9em; font-size: 0.9em;
color: #666; color: #666;
text-transform: capitalize;
} }
.color-square { .color-square {
display: inline-block; display: inline-block;