alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2015-09-14 15:36:08 +01:00
parent 9a72667e91 5e157bcd16
commit 5ffd76c670
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/views/project/editor/track-changes.jade
+2 -2
View File
@@ -76,8 +76,8 @@ div#trackChanges(ng-show="ui.view == 'track-changes'")
div.user(ng-repeat="update_user in update.meta.users")
.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
.color-square(ng-if="update_user == null", ng-style="{'background-color': 'hsl(100, 70%, 50%)'}")
.name(ng-if="update_user.id != user.id") {{update_user.first_name}} {{update_user.last_name}}
.name(ng-if="update_user.id == user.id") You
.name(ng-if="update_user && update_user.id != user.id" ng-bind="displayName(update_user)")
.name(ng-if="update_user && update_user.id == user.id") You
.name(ng-if="update_user == null") #{translate("anonymous")}
div.user(ng-if="update.meta.users.length == 0")
.color-square(style="background-color: hsl(100, 100%, 50%)")