From b468fb623b055ea6f105b40289d708023e59a07e Mon Sep 17 00:00:00 2001 From: David Mehren Date: Tue, 9 Feb 2021 20:27:29 +0100 Subject: Switch to ejs 3 compliant imports Signed-off-by: David Mehren --- public/views/error.ejs | 4 ++-- public/views/hedgedoc.ejs | 10 +++++----- public/views/hedgedoc/body.ejs | 8 ++++---- public/views/hedgedoc/footer.ejs | 4 ++-- public/views/hedgedoc/head.ejs | 8 ++++---- public/views/index.ejs | 8 ++++---- public/views/index/body.ejs | 2 +- public/views/index/footer.ejs | 6 +++--- public/views/index/head.ejs | 8 ++++---- public/views/pretty.ejs | 16 ++++++++-------- public/views/slide.ejs | 16 ++++++++-------- 11 files changed, 45 insertions(+), 45 deletions(-) (limited to 'public/views') diff --git a/public/views/error.ejs b/public/views/error.ejs index df951d4a..1768adea 100644 --- a/public/views/error.ejs +++ b/public/views/error.ejs @@ -2,12 +2,12 @@ - <%- include hedgedoc/head %> + <%- include('hedgedoc/head') %> - <%- include hedgedoc/header %> + <%- include('hedgedoc/header') %>

<%- code %> <%- detail %> <%- msg %>

diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs index f17150c4..b4bf816e 100644 --- a/public/views/hedgedoc.ejs +++ b/public/views/hedgedoc.ejs @@ -1,14 +1,14 @@ - + - <%- include hedgedoc/head %> + <%- include('hedgedoc/head') %> - <%- include hedgedoc/header %> - <%- include hedgedoc/body %> - <%- include hedgedoc/footer %> + <%- include('hedgedoc/header') %> + <%- include('hedgedoc/body') %> + <%- include('hedgedoc/footer') %> diff --git a/public/views/hedgedoc/body.ejs b/public/views/hedgedoc/body.ejs index 96cb8f95..af7b9465 100644 --- a/public/views/hedgedoc/body.ejs +++ b/public/views/hedgedoc/body.ejs @@ -247,7 +247,7 @@

-<%- include ../shared/refresh-modal %> -<%- include ../shared/signin-modal %> -<%- include ../shared/help-modal %> -<%- include ../shared/revision-modal %> +<%- include('../shared/refresh-modal') %> +<%- include('../shared/signin-modal') %> +<%- include('../shared/help-modal') %> +<%- include('../shared/revision-modal') %> diff --git a/public/views/hedgedoc/footer.ejs b/public/views/hedgedoc/footer.ejs index 9d620e29..51d47221 100644 --- a/public/views/hedgedoc/footer.ejs +++ b/public/views/hedgedoc/footer.ejs @@ -20,10 +20,10 @@ -<%- include ../build/index-scripts %> +<%- include('../build/index-scripts') %> <% } else { %> -<%- include ../build/index-pack-scripts %> +<%- include('../build/index-pack-scripts') %> <% } %> diff --git a/public/views/hedgedoc/head.ejs b/public/views/hedgedoc/head.ejs index f7e4c8fd..44668795 100644 --- a/public/views/hedgedoc/head.ejs +++ b/public/views/hedgedoc/head.ejs @@ -4,7 +4,7 @@ -<%- include ../includes/favicon %> +<%- include('../includes/favicon') %> <% for (var og in opengraph) { %> <% if (opengraph.hasOwnProperty(og) && opengraph[og].trim() !== '') { %> @@ -21,9 +21,9 @@ -<%- include ../build/index-header %> -<%- include ../shared/polyfill %> +<%- include('../build/index-header') %> +<%- include('../shared/polyfill') %> <% } else { %> -<%- include ../build/index-pack-header %> +<%- include('../build/index-pack-header') %> <% } %> diff --git a/public/views/index.ejs b/public/views/index.ejs index 0da58bcd..bd2c4fe6 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -2,13 +2,13 @@ - <%- include index/head %> + <%- include('index/head') %> - <%- include index/header %> - <%- include index/body %> - <%- include index/footer %> + <%- include('index/header') %> + <%- include('index/body') %> + <%- include('index/footer') %> diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs index d3552c75..5ae462d9 100644 --- a/public/views/index/body.ejs +++ b/public/views/index/body.ejs @@ -209,4 +209,4 @@ -<%- include ../shared/signin-modal %> +<%- include('../shared/signin-modal') %> diff --git a/public/views/index/footer.ejs b/public/views/index/footer.ejs index 638f4930..c9532f6d 100644 --- a/public/views/index/footer.ejs +++ b/public/views/index/footer.ejs @@ -6,7 +6,7 @@ -<%- include ../build/cover-scripts %> +<%- include('../build/cover-scripts') %> <% } else { %> -<%- include ../build/cover-pack-scripts %> -<% } %> \ No newline at end of file +<%- include('../build/cover-pack-scripts') %> +<% } %> diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index 900d6324..a6e79e35 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -6,7 +6,7 @@ -<%- include ../includes/favicon %> +<%- include('../includes/favicon') %> @@ -22,8 +22,8 @@ -<%- include ../build/cover-header %> -<%- include ../shared/polyfill %> +<%- include('../build/cover-header') %> +<%- include('../shared/polyfill') %> <% } else { %> -<%- include ../build/cover-pack-header %> +<%- include('../build/cover-pack-header') %> <% } %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 074b181b..78795211 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -24,17 +24,17 @@ <% } %> <%= title %> - <%- include includes/favicon.ejs %> + <%- include('includes/favicon.ejs') %> <% if(useCDN) { %> - <%- include build/pretty-header %> - <%- include shared/polyfill %> + <%- include('build/pretty-header') %> + <%- include('shared/polyfill') %> <% } else { %> - <%- include build/pretty-pack-header %> + <%- include('build/pretty-pack-header') %> <% } %> @@ -73,7 +73,7 @@ <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>

- <%- include shared/disqus %> + <%- include('shared/disqus') %>

<% } %> @@ -97,11 +97,11 @@ -<%- include build/pretty-scripts %> +<%- include('build/pretty-scripts') %> <% } else { %> -<%- include build/pretty-pack-scripts %> +<%- include('build/pretty-pack-scripts') %> <% } %> -<%- include shared/ga %> +<%- include('shared/ga') %> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index b88fe5a2..bec8079a 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -13,19 +13,19 @@ <% } %> <%= title %> - <%- include includes/favicon.ejs %> + <%- include('includes/favicon.ejs') %> <% if(useCDN) { %> - <%- include build/slide-header %> - <%- include shared/polyfill %> + <%- include('build/slide-header') %> + <%- include('shared/polyfill') %> <% } else { %> - <%- include build/slide-pack-header %> + <%- include('build/slide-pack-header') %> <% } %> @@ -80,7 +80,7 @@ <% if(typeof disqus !== 'undefined' && disqus && !dnt) { %>

- <%- include shared/disqus %> + <%- include('shared/disqus') %>

<% } %> @@ -104,14 +104,14 @@ - <%- include build/slide-scripts %> + <%- include('build/slide-scripts') %> <% } else { %> - <%- include build/slide-pack-scripts %> + <%- include('build/slide-pack-scripts') %> <% } %> -<%- include shared/ga %> +<%- include('shared/ga') %> -- cgit v1.2.3