From bf4c6d021c353f9f6779ba813dab8d44b17addbf Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Mon, 10 Oct 2016 16:25:51 +0800
Subject: Extract config.js from common.js to make client setting file clean
 and also make upgrade easier

---
 public/views/slide.ejs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'public/views/slide.ejs')

diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 3c5498c6..a0016375 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -122,6 +122,7 @@
         <script src="<%- url %>/vendor/viz.js/viz.js" defer></script>
         <script src="<%- url %>/vendor/pdfobject/pdfobject.min.js" defer></script>
         <script src="<%- url %>/vendor/md-toc.js" defer></script>
+        <script src="<%- url %>/js/config.js" defer></script>
         <script src="<%- url %>/js/common.js" defer></script>
         <script src="<%- url %>/js/extra.js" defer></script>
         <script src="<%- url %>/js/render.js" defer></script>
-- 
cgit v1.2.3


From 3175616573a9346f8ae2731a8a963b28c42224c3 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Mon, 10 Oct 2016 20:32:20 +0800
Subject: Update to support showing owner on the infobar

---
 public/views/slide.ejs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'public/views/slide.ejs')

diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index a0016375..fb3734bc 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -60,12 +60,19 @@
                             <% if(lastchangeuserprofile) { %>
                                 <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>
                             <% } else { %>
-                                <span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o"></i></span>
+                                <span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
                             <% } %>
                             &nbsp;<span class="text-uppercase ui-status-lastchange"></span>
                             <span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
                         </span>
                         <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>
+                        <br>
+                        <% if(ownerprofile && owner !== lastchangeuser) { %>
+                        <span class="ui-owner">
+                            &thinsp;<i class="ui-user-icon small" style="background-image: url(<%- ownerprofile.photo %>);" data-toggle="tooltip" data-placement="right" title="<%- ownerprofile.name %>"></i>
+                            &nbsp;<span class="text-uppercase">owned this note</span>
+                        </span>
+                        <% } %>
                     </small>
                 </div>
                 <% if(typeof disqus !== 'undefined' && disqus) { %>
-- 
cgit v1.2.3


From fb5d7e43592c1a14831067e28def9c4b9e2a97ca Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Mon, 10 Oct 2016 21:14:28 +0800
Subject: Update npm and bower dependencies with related patch

---
 public/views/slide.ejs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'public/views/slide.ejs')

diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index fb3734bc..443e1468 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -87,11 +87,11 @@
             MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }});
         </script>
         <% if(useCDN) { %>
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-        <script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js" defer></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script src="//cdn.jsdelivr.net/velocity/1.3.1/velocity.min.js" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/3.6.1/js-yaml.min.js" defer></script>
         <script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" defer></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.14.1/moment-with-locales.min.js" defer></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.15.1/moment-with-locales.min.js" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/6.0.0/mermaid.min.js" defer></script>
         <% } else { %>
         <script src="<%- url %>/vendor/jquery/dist/jquery.min.js"></script>
-- 
cgit v1.2.3