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/foot.ejs | 1 + public/views/index.ejs | 1 + public/views/pretty.ejs | 1 + public/views/slide.ejs | 1 + 4 files changed, 4 insertions(+) (limited to 'public/views') diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 9328ac9c..0397317d 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -75,6 +75,7 @@ + diff --git a/public/views/index.ejs b/public/views/index.ejs index f5f848e6..61544c86 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -205,6 +205,7 @@ + diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 2546b1ac..7af474a6 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -127,6 +127,7 @@ + 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 @@ + -- cgit v1.2.3 From 4c9dc5fa1f659d188307d9169abd92a15e89860c Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 10 Oct 2016 16:29:40 +0800 Subject: Add support of Italian, Turkish, Russian, Dutch, Croatian, Polish locales --- public/views/index.ejs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'public/views') diff --git a/public/views/index.ejs b/public/views/index.ejs index 61544c86..561a5987 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -154,6 +154,12 @@ + + + + + + -- cgit v1.2.3 From a5e6b5dd3b661052956f72bbeab88931e7c74315 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 10 Oct 2016 19:48:05 +0800 Subject: Update to support Ukrainian locale --- public/views/index.ejs | 1 + 1 file changed, 1 insertion(+) (limited to 'public/views') diff --git a/public/views/index.ejs b/public/views/index.ejs index 561a5987..1e0fe3f4 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -160,6 +160,7 @@ + -- 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/body.ejs | 7 ++++++- public/views/pretty.ejs | 9 ++++++++- public/views/slide.ejs | 9 ++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) (limited to 'public/views') diff --git a/public/views/body.ejs b/public/views/body.ejs index 28680e49..0b56edbb 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -7,7 +7,7 @@ -   +     @@ -21,6 +21,11 @@
  • Private - Only owner can view & edit
    • +
    +
    diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 7af474a6..cc6fb332 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -54,12 +54,19 @@ <% if(lastchangeuserprofile) { %>   <% } else { %> -   +   <% } %>   <%- viewcount %> views +
    + <% if(ownerprofile && owner !== lastchangeuser) { %> + +   +  owned this note + + <% } %>
    <%- body %>
    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) { %>   <% } else { %> -   +   <% } %>   <%- viewcount %> views +
    + <% if(ownerprofile && owner !== lastchangeuser) { %> + +   +  owned this note + + <% } %> <% if(typeof disqus !== 'undefined' && disqus) { %> -- cgit v1.2.3 From 7e7919ce865771b884557e1f175e587491cb1abb Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 10 Oct 2016 20:34:53 +0800 Subject: Fix broken link id reference --- public/views/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public/views') diff --git a/public/views/index.ejs b/public/views/index.ejs index 1e0fe3f4..771d3c48 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -70,7 +70,7 @@
    - +

    <%= __('Collaborate with URL') %>

     -- cgit v1.2.3 From 12d5ed43a7376e0ca361160698f07066218d6ed2 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Mon, 10 Oct 2016 21:04:24 +0800 Subject: Update to support delete note --- public/views/body.ejs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'public/views') diff --git a/public/views/body.ejs b/public/views/body.ejs index 0b56edbb..79f2544e 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -19,6 +19,8 @@
  • Editable - Signed people can edit
  • Locked - Only owner can edit
  • Private - Only owner can view & edit
    • +
  • +
  • Delete this note

    • @@ -220,6 +222,26 @@
    + + <%- include refresh-modal %> <%- include signin-modal %> <%- include help-modal %> -- 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/foot.ejs | 8 ++++---- public/views/html.hbs | 4 ++-- public/views/index.ejs | 6 +++--- public/views/pretty.ejs | 4 ++-- public/views/slide.ejs | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'public/views') diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 0397317d..80c08f63 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -3,14 +3,14 @@ <% if(useCDN) { %> - - + + - + - + <% } else { %> diff --git a/public/views/html.hbs b/public/views/html.hbs index 7213ff9f..3f25e5d7 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + - + + - + <% } else { %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index cc6fb332..79652012 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -92,11 +92,11 @@ MathJax.Hub.Config({ messageStyle: "none", skipStartupTypeset: true ,tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']], processEscapes: true }}); <% if(useCDN) { %> - + - + <% } else { %> 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 }}); <% if(useCDN) { %> - - + + - + <% } else { %> -- cgit v1.2.3 From cd9f8fe36b707ff5a9f8f7be4d55145ddee97f3a Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Tue, 11 Oct 2016 16:48:42 +0800 Subject: Update to support pagination for history list --- public/views/index.ejs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'public/views') diff --git a/public/views/index.ejs b/public/views/index.ejs index f71cbdf5..4fdee8cf 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -135,6 +135,7 @@ +
    @@ -209,6 +210,7 @@ <% } %> + -- cgit v1.2.3