Skip to content

Commit 3175616

Browse files
jackycutejackycute
committed
Update to support showing owner on the infobar
1 parent 7a85d62 commit 3175616

6 files changed

Lines changed: 55 additions & 8 deletions

File tree

‎lib/response.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ function showPublishNote(req, res, next) {
205205
url: origin,
206206
body: text,
207207
useCDN: config.usecdn,
208+
owner: note.owner ? note.owner.id : null,
209+
ownerprofile: note.owner ? models.User.parseProfile(note.owner.profile) : null,
210+
lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,
208211
lastchangeuserprofile: note.lastchangeuser ? models.User.parseProfile(note.lastchangeuser.profile) : null,
209212
robots: meta.robots || false, //default allow robots
210213
GA: meta.GA,
@@ -576,6 +579,9 @@ function showPublishSlide(req, res, next) {
576579
slides: slides,
577580
meta: JSON.stringify(obj.meta || {}),
578581
useCDN: config.usecdn,
582+
owner: note.owner ? note.owner.id : null,
583+
ownerprofile: note.owner ? models.User.parseProfile(note.owner.profile) : null,
584+
lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,
579585
lastchangeuserprofile: note.lastchangeuser ? models.User.parseProfile(note.lastchangeuser.profile) : null,
580586
robots: meta.robots || false, //default allow robots
581587
GA: meta.GA,

‎public/js/extra.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var lastchangeui = {
77
user: $(".ui-lastchangeuser"),
88
nouser: $(".ui-no-lastchangeuser")
99
}
10+
var ownerui = $(".ui-owner");
1011

1112
function updateLastChange() {
1213
if (!lastchangeui) return;
@@ -41,6 +42,23 @@ function updateLastChangeUser() {
4142
}
4243
}
4344

45+
var owner = null;
46+
var ownerprofile = null;
47+
function updateOwner() {
48+
if (ownerui) {
49+
if (owner && ownerprofile && owner !== lastchangeuser) {
50+
var icon = ownerui.children('i');
51+
icon.attr('title', ownerprofile.name).tooltip('fixTitle');
52+
var styleString = 'background-image:url(' + ownerprofile.photo + ')';
53+
if (ownerprofile.photo && icon.attr('style') !== styleString)
54+
icon.attr('style', styleString);
55+
ownerui.show();
56+
} else {
57+
ownerui.hide();
58+
}
59+
}
60+
}
61+
4462
//get title
4563
function getTitle(view) {
4664
var title = "";

‎public/js/index.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,7 +2255,7 @@ var authorship = [];
22552255
var authorshipMarks = {};
22562256
var authorMarks = {}; // temp variable
22572257
var addTextMarkers = []; // temp variable
2258-
function updateLastInfo(data) {
2258+
function updateInfo(data) {
22592259
//console.log(data);
22602260
if (data.hasOwnProperty('createtime') && createtime !== data.createtime) {
22612261
createtime = data.createtime;
@@ -2265,10 +2265,16 @@ function updateLastInfo(data) {
22652265
lastchangetime = data.updatetime;
22662266
updateLastChange();
22672267
}
2268+
if (data.hasOwnProperty('owner') && owner !== data.owner) {
2269+
owner = data.owner;
2270+
ownerprofile = data.ownerprofile;
2271+
updateOwner();
2272+
}
22682273
if (data.hasOwnProperty('lastchangeuser') && lastchangeuser !== data.lastchangeuser) {
22692274
lastchangeuser = data.lastchangeuser;
22702275
lastchangeuserprofile = data.lastchangeuserprofile;
22712276
updateLastChangeUser();
2277+
updateOwner();
22722278
}
22732279
if (data.hasOwnProperty('authors') && authors !== data.authors) {
22742280
authors = data.authors;
@@ -2483,23 +2489,21 @@ socket.on('check', function (data) {
24832489
data = LZString.decompressFromUTF16(data);
24842490
data = JSON.parse(data);
24852491
//console.log(data);
2486-
updateLastInfo(data);
2492+
updateInfo(data);
24872493
});
24882494
socket.on('permission', function (data) {
24892495
updatePermission(data.permission);
24902496
});
24912497
var docmaxlength = null;
2492-
var owner = null;
24932498
var permission = null;
24942499
socket.on('refresh', function (data) {
24952500
data = LZString.decompressFromUTF16(data);
24962501
data = JSON.parse(data);
24972502
//console.log(data);
24982503
docmaxlength = data.docmaxlength;
24992504
editor.setOption("maxLength", docmaxlength);
2500-
owner = data.owner;
2505+
updateInfo(data);
25012506
updatePermission(data.permission);
2502-
updateLastInfo(data);
25032507
if (!loaded) {
25042508
// auto change mode if no content detected
25052509
var nocontent = editor.getValue().length <= 0;

‎public/views/body.ejs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<small>
88
<span>
99
<span class="ui-lastchangeuser" style="display: none;">&thinsp;<i class="ui-user-icon small" data-toggle="tooltip" data-placement="right"></i></span>
10-
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o"></i></span>
10+
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
1111
&nbsp;<span class="text-uppercase ui-status-lastchange"></span>
1212
<span class="ui-lastchange text-uppercase"></span>
1313
</span>
@@ -21,6 +21,11 @@
2121
<li class="ui-permission-private"><a><i class="fa fa-hand-stop-o fa-fw"></i> Private - Only owner can view &amp; edit</a></li>
2222
</ul>
2323
</span>
24+
<br>
25+
<span class="ui-owner" style="display: none;">
26+
&thinsp;<i class="ui-user-icon small" data-toggle="tooltip" data-placement="right"></i>
27+
&nbsp;<span class="text-uppercase">owned this note</span>
28+
</span>
2429
</small>
2530
</div>
2631
<div id="doc" class="markdown-body container-fluid"></div>

‎public/views/pretty.ejs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,19 @@
5454
<% if(lastchangeuserprofile) { %>
5555
<span class="ui-lastchangeuser">&thinsp;<i class="ui-user-icon small" style="background-image: url(<%- lastchangeuserprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- lastchangeuserprofile.name %>"></i></span>
5656
<% } else { %>
57-
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o"></i></span>
57+
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
5858
<% } %>
5959
&nbsp;<span class="text-uppercase ui-status-lastchange"></span>
6060
<span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
6161
</span>
6262
<span class="pull-right"><%- viewcount %> views <a href="#" class="ui-edit" title="Edit this note"><i class="fa fa-fw fa-pencil"></i></a></span>
63+
<br>
64+
<% if(ownerprofile && owner !== lastchangeuser) { %>
65+
<span class="ui-owner">
66+
&thinsp;<i class="ui-user-icon small" style="background-image: url(<%- ownerprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- ownerprofile.name %>"></i>
67+
&nbsp;<span class="text-uppercase">owned this note</span>
68+
</span>
69+
<% } %>
6370
</small>
6471
</div>
6572
<div id="doc" class="container markdown-body"><%- body %></div>

‎public/views/slide.ejs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,19 @@
6060
<% if(lastchangeuserprofile) { %>
6161
<span class="ui-lastchangeuser">&thinsp;<i class="ui-user-icon small" style="background-image: url(<%- lastchangeuserprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- lastchangeuserprofile.name %>"></i></span>
6262
<% } else { %>
63-
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o"></i></span>
63+
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
6464
<% } %>
6565
&nbsp;<span class="text-uppercase ui-status-lastchange"></span>
6666
<span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
6767
</span>
6868
<span class="pull-right"><%- viewcount %> views <a href="#" class="ui-edit" title="Edit this note"><i class="fa fa-fw fa-pencil"></i></a></span>
69+
<br>
70+
<% if(ownerprofile && owner !== lastchangeuser) { %>
71+
<span class="ui-owner">
72+
&thinsp;<i class="ui-user-icon small" style="background-image: url(<%- ownerprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- ownerprofile.name %>"></i>
73+
&nbsp;<span class="text-uppercase">owned this note</span>
74+
</span>
75+
<% } %>
6976
</small>
7077
</div>
7178
<% if(typeof disqus !== 'undefined' && disqus) { %>

0 commit comments

Comments
 (0)