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

Include names in view

Browse source
This commit is contained in:
James Allen 2014-03-06 18:13:07 +00:00
parent 9329213d94
commit be8035faa8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/templates.jade
View file

@ -435,7 +435,7 @@
input(type="radio",name="toVersion").change-selector-to input(type="radio",name="toVersion").change-selector-to
div(class='change-description') div(class='change-description')
div(class='change-message') {{user_id}} div(class='change-message') {{user.first_name}} {{user.last_name}}
div(class='change-date') {{end_ts}} div(class='change-date') {{end_ts}}
div(class='change-date') {{start_ts}} div(class='change-date') {{start_ts}}

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

@ -74,7 +74,7 @@ define [
@_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """ @_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """
background-color : hsl(#{hue}, 70%, 85%); background-color : hsl(#{hue}, 70%, 85%);
""" """
tag = "Added by #{entry.meta.user_id}" tag = "Added by #{entry.meta.user.email}"
if entry.d? if entry.d?
@_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """ @_addMarkerWithCustomStyle session, markerBackLayer, range, "deleted-change-background", false, """
background-color : hsl(#{hue}, 70%, 95%); background-color : hsl(#{hue}, 70%, 95%);
@ -83,7 +83,7 @@ define [
height: #{Math.round(lineHeight/2) - 1}px; height: #{Math.round(lineHeight/2) - 1}px;
border-bottom: 2px solid hsl(#{hue}, 70%, 40%); border-bottom: 2px solid hsl(#{hue}, 70%, 40%);
""" """
tag = "Deleted by #{entry.meta.user_id}" tag = "Deleted by #{entry.meta.user.email}"
tag += " on #{entry.meta.end_ts}" tag += " on #{entry.meta.end_ts}"
@_addNameTag session, id, range, tag, """ @_addNameTag session, id, range, tag, """

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

@ -6,6 +6,6 @@ define [
return { return {
start_ts: change.meta.start_ts start_ts: change.meta.start_ts
end_ts: change.meta.end_ts end_ts: change.meta.end_ts
user_id: change.meta.user_id user: change.meta.user
version: change.v version: change.v
} }