From 44ffc564da1dd20b2fae3247d9fa314a52e0aaca Mon Sep 17 00:00:00 2001 From: Claudius Date: Thu, 13 Sep 2018 21:26:39 +0200 Subject: removing global site layout vars from individual routers, putting them into app.local Signed-off-by: Claudius --- public/views/codimd/foot.ejs | 6 ++-- public/views/codimd/head.ejs | 6 ++-- public/views/codimd/header.ejs | 6 ++-- public/views/error.ejs | 4 +-- public/views/index/body.ejs | 30 +++++++++--------- public/views/index/head.ejs | 4 +-- public/views/pretty.ejs | 12 +++---- public/views/shared/refresh-modal.ejs | 4 +-- public/views/shared/signin-modal.ejs | 60 +++++++++++++++++------------------ public/views/slide.ejs | 24 +++++++------- 10 files changed, 78 insertions(+), 78 deletions(-) (limited to 'public') diff --git a/public/views/codimd/foot.ejs b/public/views/codimd/foot.ejs index 000ccb6d..9b1c68d6 100644 --- a/public/views/codimd/foot.ejs +++ b/public/views/codimd/foot.ejs @@ -1,4 +1,4 @@ - + <% if(useCDN) { %> @@ -21,7 +21,7 @@ <%- include ../build/index-scripts %> <% } else { %> - - + + <%- include ../build/index-pack-scripts %> <% } %> diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs index 356ded6d..afa89d13 100644 --- a/public/views/codimd/head.ejs +++ b/public/views/codimd/head.ejs @@ -5,8 +5,8 @@ <%= title %> - - + + <% if(useCDN) { %> @@ -16,6 +16,6 @@ <%- include ../build/index-header %> <%- include ../shared/polyfill %> <% } else { %> - + <%- include ../build/index-pack-header %> <% } %> diff --git a/public/views/codimd/header.ejs b/public/views/codimd/header.ejs index 1b5e4222..d8df33b8 100644 --- a/public/views/codimd/header.ejs +++ b/public/views/codimd/header.ejs @@ -13,7 +13,7 @@ - CodiMD + CodiMD
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs index fc10dfa0..7a601bdf 100644 --- a/public/views/index/head.ejs +++ b/public/views/index/head.ejs @@ -7,8 +7,8 @@ CodiMD - <%= __('Collaborative markdown notes') %> - - + + <% if(useCDN) { %> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index a087be7f..ff4dcc23 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -15,8 +15,8 @@ <% } %> <%= title %> - - + + <% if(useCDN) { %> @@ -25,7 +25,7 @@ <%- include build/pretty-header %> <%- include shared/polyfill %> <% } else { %> - + <%- include build/pretty-pack-header %> <% } %> @@ -71,7 +71,7 @@ - + <% if(useCDN) { %> @@ -90,8 +90,8 @@ <%- include build/pretty-scripts %> <% } else { %> - - + + <%- include build/pretty-pack-scripts %> <% } %> <%- include shared/ga %> diff --git a/public/views/shared/refresh-modal.ejs b/public/views/shared/refresh-modal.ejs index 64580545..2aa652aa 100644 --- a/public/views/shared/refresh-modal.ejs +++ b/public/views/shared/refresh-modal.ejs @@ -14,7 +14,7 @@ @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/public/views/shared/signin-modal.ejs b/public/views/shared/signin-modal.ejs index b413511c..d46b8d54 100644 --- a/public/views/shared/signin-modal.ejs +++ b/public/views/shared/signin-modal.ejs @@ -8,56 +8,56 @@
- <% if(facebook) { %> - + <% if (authProviders.facebook) { %> + <%= __('Sign in via %s', 'Facebook') %> <% } %> - <% if(twitter) { %> - + <% if (authProviders.twitter) { %> + <%= __('Sign in via %s', 'Twitter') %> <% } %> - <% if(github) { %> - + <% if (authProviders.github) { %> + <%= __('Sign in via %s', 'GitHub') %> <% } %> - <% if(gitlab) { %> - + <% if (authProviders.gitlab) { %> + <%= __('Sign in via %s', 'GitLab') %> <% } %> - <% if(mattermost) { %> - + <% if (authProviders.mattermost) { %> + <%= __('Sign in via %s', 'Mattermost') %> <% } %> - <% if(dropbox) { %> - + <% if (authProviders.dropbox) { %> + <%= __('Sign in via %s', 'Dropbox') %> <% } %> - <% if(google) { %> - + <% if (authProviders.google) { %> + <%= __('Sign in via %s', 'Google') %> <% } %> - <% if(saml) { %> - + <% if (authProviders.saml) { %> + <%= __('Sign in via %s', 'SAML') %> <% } %> - <% if(oauth2) { %> - - <%= __('Sign in via %s', oauth2ProviderName || 'OAuth2') %> + <% if (authProviders.oauth2) { %> + + <%= __('Sign in via %s', authProviders.oauth2ProviderName || 'OAuth2') %> <% } %> - <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || saml || oauth2) && ldap) { %> + <% if ((authProviders.facebook || authProviders.twitter || authProviders.github || authProviders.gitlab || authProviders.mattermost || authProviders.dropbox || authProviders.google || authProviders.saml || authProviders.oauth2) && authProviders.ldap) { %>
<% }%> - <% if(ldap) { %> -

Via <% if (ldapProviderName) { %> <%= ldapProviderName %> (LDAP) <% } else { %> LDAP <% } %>

+ <% if (authProviders.ldap) { %> +

Via <% if (authProviders.ldapProviderName) { %> <%= authProviders.ldapProviderName %> (LDAP) <% } else { %> LDAP <% } %>

@@ -73,15 +73,15 @@
- +
<% } %> - <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || oauth2) && openID) { %> + <% if ((authProviders.facebook || authProviders.twitter || authProviders.github || authProviders.gitlab || authProviders.mattermost || authProviders.dropbox || authProviders.google || authProviders.ldap || authProviders.oauth2) && authProviders.openID) { %>
<% }%> - <% if(openID) { %> + <% if (authProviders.openID) { %>

OpenID

@@ -92,15 +92,15 @@
- +
<% } %> - <% if((facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || oauth2 || openID) && email) { %> + <% if ((authProviders.facebook || authProviders.twitter || authProviders.github || authProviders.gitlab || authProviders.mattermost || authProviders.dropbox || authProviders.google || authProviders.ldap || authProviders.oauth2 || authProviders.openID) && authProviders.email) { %>
<% }%> - <% if(email) { %> + <% if (authProviders.email) { %>

Via Email

@@ -117,8 +117,8 @@
- - <% if(allowEmailRegister) { %><% }%> + + <% if (authProviders.allowEmailRegister) { %><% }%>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 42fb5199..9b19af2a 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -12,8 +12,8 @@ <% } %> <%= title %> - - + + <% if(useCDN) { %> @@ -23,28 +23,28 @@ <%- include build/slide-header %> <%- include shared/polyfill %> <% } else { %> - - + + <%- include build/slide-pack-header %> <% } %> <% if(typeof theme !== 'undefined' && theme) { %> - + <% } else { %> - + <% } %> - + - + @@ -86,7 +86,7 @@
- + <% if(useCDN) { %> @@ -106,8 +106,8 @@ <%- include build/slide-scripts %> <% } else { %> - - + + <%- include build/slide-pack-scripts %> <% } %> -- cgit v1.2.3