removing global site layout vars from individual routers, putting them into app.local

Signed-off-by: Claudius <opensource@amenthes.de>

app.js

@@ -175,6 +175,29 @@ app.set('views', config.viewPath)
 app.engine('ejs', ejs.renderFile)
 // set view engine
 app.set('view engine', 'ejs')
+// set generally available variables for all views
+app.locals.useCDN = config.useCDN
+app.locals.serverURL = config.serverURL
+app.locals.allowAnonymous = config.allowAnonymous
+app.locals.allowAnonymousEdits = config.allowAnonymousEdits
+app.locals.allowPDFExport = config.allowPDFExport
+app.locals.authProviders = {
+  facebook: config.isFacebookEnable,
+  twitter: config.isTwitterEnable,
+  github: config.isGitHubEnable,
+  gitlab: config.isGitLabEnable,
+  mattermost: config.isMattermostEnable,
+  dropbox: config.isDropboxEnable,
+  google: config.isGoogleEnable,
+  ldap: config.isLDAPEnable,
+  ldapProviderName: config.ldap.providerName,
+  saml: config.isSAMLEnable,
+  oauth2: config.isOAuth2Enable,
+  oauth2ProviderName: config.oauth2.providerName,
+  openID: config.isOpenIDEnable,
+  email: config.isEmailEnable,
+  allowEmailRegister: config.allowEmailRegister
+}
 
 app.use(require('./lib/web/baseRouter'))
 app.use(require('./lib/web/statusRouter'))

lib/response.js

@@ -55,12 +55,10 @@ var response = {
 
 function responseError (res, code, detail, msg) {
   res.status(code).render('error.ejs', {
-    url: config.serverURL,
     title: code + ' ' + detail + ' ' + msg,
     code: code,
     detail: detail,
-    msg: msg,
+    msg: msg
-    useCDN: config.useCDN
   })
 }
 
@@ -69,26 +67,6 @@ function showIndex (req, res, next) {
   var deleteToken = ''
 
   var data = {
-    url: config.serverURL,
-    useCDN: config.useCDN,
-    allowAnonymous: config.allowAnonymous,
-    allowAnonymousEdits: config.allowAnonymousEdits,
-    facebook: config.isFacebookEnable,
-    twitter: config.isTwitterEnable,
-    github: config.isGitHubEnable,
-    gitlab: config.isGitLabEnable,
-    mattermost: config.isMattermostEnable,
-    dropbox: config.isDropboxEnable,
-    google: config.isGoogleEnable,
-    ldap: config.isLDAPEnable,
-    ldapProviderName: config.ldap.providerName,
-    saml: config.isSAMLEnable,
-    oauth2: config.isOAuth2Enable,
-    oauth2ProviderName: config.oauth2.providerName,
-    email: config.isEmailEnable,
-    allowEmailRegister: config.allowEmailRegister,
-    allowPDFExport: config.allowPDFExport,
-    openID: config.isOpenIDEnable,
     signin: authStatus,
     infoMessage: req.flash('info'),
     errorMessage: req.flash('error'),
@@ -124,27 +102,7 @@ function responseCodiMD (res, note) {
     'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
   })
   res.render('codimd.ejs', {
-    url: config.serverURL,
+    title: title
-    title: title,
-    useCDN: config.useCDN,
-    allowAnonymous: config.allowAnonymous,
-    allowAnonymousEdits: config.allowAnonymousEdits,
-    facebook: config.isFacebookEnable,
-    twitter: config.isTwitterEnable,
-    github: config.isGitHubEnable,
-    gitlab: config.isGitLabEnable,
-    mattermost: config.isMattermostEnable,
-    dropbox: config.isDropboxEnable,
-    google: config.isGoogleEnable,
-    ldap: config.isLDAPEnable,
-    ldapProviderName: config.ldap.providerName,
-    oauth2ProviderName: config.oauth2.providerName,
-    saml: config.isSAMLEnable,
-    oauth2: config.isOAuth2Enable,
-    email: config.isEmailEnable,
-    allowEmailRegister: config.allowEmailRegister,
-    allowPDFExport: config.allowPDFExport,
-    openID: config.isOpenIDEnable
   })
 }
 
@@ -254,16 +212,13 @@ function showPublishNote (req, res, next) {
       var updatetime = note.lastchangeAt
       var title = models.Note.decodeTitle(note.title)
       title = models.Note.generateWebTitle(meta.title || title)
-      var origin = config.serverURL
       var data = {
         title: title,
         description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
         viewcount: note.viewcount,
         createtime: createtime,
         updatetime: updatetime,
-        url: origin,
         body: body,
-        useCDN: config.useCDN,
         owner: note.owner ? note.owner.id : null,
         ownerprofile: note.owner ? models.User.getProfile(note.owner) : null,
         lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,
@@ -634,18 +589,15 @@ function showPublishSlide (req, res, next) {
       var updatetime = note.lastchangeAt
       var title = models.Note.decodeTitle(note.title)
       title = models.Note.generateWebTitle(meta.title || title)
-      var origin = config.serverURL
       var data = {
         title: title,
         description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
         viewcount: note.viewcount,
         createtime: createtime,
         updatetime: updatetime,
-        url: origin,
         body: markdown,
         theme: meta.slideOptions && utils.isRevealTheme(meta.slideOptions.theme),
         meta: JSON.stringify(extracted.meta),
-        useCDN: config.useCDN,
         owner: note.owner ? note.owner.id : null,
         ownerprofile: note.owner ? models.User.getProfile(note.owner) : null,
         lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,

public/views/codimd/foot.ejs

@@ -1,4 +1,4 @@
-<script src="<%= url %>/js/mathjax-config-extra.js"></script>
+<script src="<%= serverURL %>/js/mathjax-config-extra.js"></script>
 <% if(useCDN) { %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" integrity="sha256-PieqE0QdEDMppwXrTzSZQr6tWFX3W5KkyRVyF1zN3eg=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
@@ -21,7 +21,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
 <%- include ../build/index-scripts %>
 <% } else { %>
-<script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
+<script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
-<script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
+<script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
 <%- include ../build/index-pack-scripts %>
 <% } %>

public/views/codimd/head.ejs

@@ -5,8 +5,8 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <meta name="mobile-web-app-capable" content="yes">
 <title><%= title %></title>
-<link rel="icon" type="image/png" href="<%- url %>/favicon.png">
+<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
-<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
+<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 <% if(useCDN) { %>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
@@ -16,6 +16,6 @@
 <%- include ../build/index-header %>
 <%- include ../shared/polyfill %>
 <% } else { %>
-<link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
+<link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
 <%- include ../build/index-pack-header %>
 <% } %>

public/views/codimd/header.ejs

@@ -13,7 +13,7 @@
             <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
             </ul>
         </div>
-        <a class="navbar-brand pull-left" href="<%- url %>/"><i class="fa fa-file-text"></i> CodiMD</a>
+        <a class="navbar-brand pull-left" href="<%- serverURL %>/"><i class="fa fa-file-text"></i> CodiMD</a>
         <div class="nav-mobile pull-right visible-xs">
             <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;">
                 <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple>
@@ -22,7 +22,7 @@
                 <i class="fa fa-caret-down"></i>
             </a>
             <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
-                <li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="<%- url %>/new" target="_blank" rel="noopener"><i class="fa fa-plus fa-fw"></i> <%= __('New') %></a>
+                <li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="<%- serverURL %>/new" target="_blank" rel="noopener"><i class="fa fa-plus fa-fw"></i> <%= __('New') %></a>
                 </li>
                 <li role="presentation"><a role="menuitem" class="ui-publish" tabindex="-1" href="#" target="_blank" rel="noopener"><i class="fa fa-share-square-o fa-fw"></i> <%= __('Publish') %></a>
                 </li>
@@ -115,7 +115,7 @@
         </ul>
         <ul class="nav navbar-nav navbar-right" style="padding:0;">
             <li>
-                <a href="<%- url %>/new" target="_blank" rel="noopener" class="ui-new">
+                <a href="<%- serverURL %>/new" target="_blank" rel="noopener" class="ui-new">
                     <i class="fa fa-plus"></i> <%= __('New') %>
                 </a>
             </li>

public/views/error.ejs

@@ -3,7 +3,7 @@
 
 <head>
     <%- include codimd/head %>
-    <link rel="stylesheet" href="<%- url %>/css/center.css">
+    <link rel="stylesheet" href="<%- serverURL %>/css/center.css">
 </head>
 
 <body>

public/views/index/body.ejs

@@ -13,23 +13,23 @@
                             </li>
                             <div class="ui-signin" style="float: right; margin-top: 8px;<% if(signin) { %> display: none;<% } %>">
                                 <% if (allowAnonymous) { %>
-                                <a type="button" href="<%- url %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
+                                <a type="button" href="<%- serverURL %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
                                 <% } %>
-                                <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || oauth2 || email) { %>
+                                <% if (authProviders.facebook || authProviders.twitter || authProviders.github || authProviders.gitlab || authProviders.mattermost || authProviders.dropbox || authProviders.google || authProviders.ldap || authProviders.saml || authProviders.oauth2 || authProviders.email) { %>
                                 <button class="btn btn-sm btn-success ui-signin" data-toggle="modal" data-target=".signin-modal"><%= __('Sign In') %></button>
                                 <% } %>
                             </div>
                             <div class="ui-signout" style="float: right; margin-top: 8px;<% if(!signin) { %> display: none;<% } %>">
-                                <a type="button" href="<%- url %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New note') %></a>
+                                <a type="button" href="<%- serverURL %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New note') %></a>
                                 <span class="ui-profile dropdown pull-right">
                                     <button id="profileLabel" class="btn btn-sm btn-link ui-profile-label" style="padding-right: 0;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                         <img class="ui-avatar" width="20" height="20"><span class="hidden-xs hidden-sm">&ensp;<span class="ui-name"></span></span>&ensp;<i class="fa fa-caret-down"></i>
                                     </button>
                                     <ul class="dropdown-menu" aria-labelledby="profileLabel">
-                                        <li><a href="<%- url %>/features"><i class="fa fa-dot-circle-o fa-fw"></i> <%= __('Features') %></a></li>
+                                        <li><a href="<%- serverURL %>/features"><i class="fa fa-dot-circle-o fa-fw"></i> <%= __('Features') %></a></li>
-                                        <li><a href="<%- url %>/me/export"><i class="fa fa-cloud-download fa-fw"></i> <%= __('Export user data') %></a></li>
+                                        <li><a href="<%- serverURL %>/me/export"><i class="fa fa-cloud-download fa-fw"></i> <%= __('Export user data') %></a></li>
                                         <li><a class="ui-delete-user" data-toggle="modal" data-target=".delete-user-modal"><i class="fa fa-trash fa-fw"></i> <%= __('Delete user') %></a></li>
-                                        <li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
+                                        <li><a href="<%- serverURL %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
                                     </ul>
                                 </span>
                             </div>
@@ -50,7 +50,7 @@
                     <% if (errorMessage && errorMessage.length > 0) { %>
                     <div class="alert alert-danger" style="max-width: 400px; margin: 0 auto;"><%= errorMessage %></div>
                     <% } %>
-                    <% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || oauth2 || email) { %>
+                    <% if (authProviders.facebook || authProviders.twitter || authProviders.github || authProviders.gitlab || authProviders.mattermost || authProviders.dropbox || authProviders.google || authProviders.ldap || authProviders.saml || authProviders.oauth2 || authProviders.email) { %>
                     <span class="ui-signin">
                         <br>
                         <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="min-width: 200px;"><%= __('Sign In') %></a>
@@ -58,26 +58,26 @@
                     <span class="ui-or"><%= __('or') %></span>
                     <% } %>
                     <span class="ui-signin">
-                        <a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
+                        <a type="button" href="<%- serverURL %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
                         <br>
                         <br>
-                        <img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
+                        <img src="<%- serverURL %>/screenshot.png" class="screenshot ui-signin">
                     </span>
                     <div class="lead row" style="width: 90%; margin: 0 auto;">
                         <div class="col-md-4 inner">
-                            <a href="<%- url %>/features#share-notes">
+                            <a href="<%- serverURL %>/features#share-notes">
                                 <i class="fa fa-bolt fa-3x"></i>
                                 <h4><%= __('Collaborate with URL') %></h4>
                             </a>
                         </div>
                         <div class="col-md-4 inner">
-                            <a href="<%- url %>/features#mathjax">
+                            <a href="<%- serverURL %>/features#mathjax">
                                 <i class="fa fa-bar-chart fa-3x"></i>
                                 <h4><%= __('Support charts and MathJax') %></h4>
                             </a>
                         </div>
                         <div class="col-md-4 inner">
-                            <a href="<%- url %>/features#slide-mode">
+                            <a href="<%- serverURL %>/features#slide-mode">
                                 <i class="fa fa-tv fa-3x"></i>
                                 <h4><%= __('Support slide mode') %></h4>
                             </a>
@@ -150,7 +150,7 @@
                         <option value="id">Bahasa Indonesia</option>
                     </select>
                     <p>
-                        Powered by <a href="https://codimd.org">CodiMD</a> | <a href="<%- url %>/s/release-notes" target="_blank" rel="noopener"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank" rel="noopener"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank" rel="noopener"><%= __('Terms of Use') %></a><% } %>
+                        Powered by <a href="https://codimd.org">CodiMD</a> | <a href="<%- serverURL %>/s/release-notes" target="_blank" rel="noopener"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- serverURL %>/s/privacy" target="_blank" rel="noopener"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- serverURL %>/s/terms-of-use" target="_blank" rel="noopener"><%= __('Terms of Use') %></a><% } %>
                     </p>
                     <h6 class="social-foot">
                         <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/CodiMD" target="_blank" rel="noopener"><i class="fa fa-github"></i> GitHub</a>, <a href="https://riot.im/app/#/room/#codimd:matrix.org" target="_blank" rel="noopener"><i class="fa fa-comments"></i> Riot</a>', '<a href="https://translate.codimd.org" target="_blank" rel="noopener"><i class="fa fa-globe"></i> POEditor</a>') %>
@@ -195,7 +195,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default ui-delete-user-modal-cancel" data-dismiss="modal"><%= __('Cancel') %></button>
-                <a type="button" class="btn btn-danger" href="<%- url %>/me/delete/<%- deleteToken %>"><%= __('Yes, do it!') %></a>
+                <a type="button" class="btn btn-danger" href="<%- serverURL %>/me/delete/<%- deleteToken %>"><%= __('Yes, do it!') %></a>
             </div>
         </div>
     </div>

public/views/index/head.ejs

@@ -7,8 +7,8 @@
 <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta name="keywords" content="Collaborative, Markdown, Notes">
 <title>CodiMD - <%= __('Collaborative markdown notes') %></title>
-<link rel="icon" type="image/png" href="<%- url %>/favicon.png">
+<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
-<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
+<link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 <% if(useCDN) { %>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />

public/views/pretty.ejs

@@ -15,8 +15,8 @@
     <meta name="description" content="<%= description %>">
     <% } %>
     <title><%= title %></title>
-    <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
+    <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
-  <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
+    <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
   <% if(useCDN) { %>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
@@ -25,7 +25,7 @@
     <%- include build/pretty-header %>
     <%- include shared/polyfill %>
   <% } else { %>
-    <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
+    <link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
     <%- include build/pretty-pack-header %>
   <% } %>
 </head>
@@ -71,7 +71,7 @@
 </body>
 
 </html>
-<script src="<%= url %>/js/mathjax-config-extra.js"></script>
+<script src="<%= serverURL %>/js/mathjax-config-extra.js"></script>
 <% if(useCDN) { %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/velocity/1.4.0/velocity.min.js" integrity="sha256-bhm0lgEt6ITaZCDzZpkr/VXVrLa5RP4u9v2AYsbzSUk=" crossorigin="anonymous" defer></script>
@@ -90,8 +90,8 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
 <%- include build/pretty-scripts %>
 <% } else { %>
-<script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
+<script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
-<script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
+<script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
 <%- include build/pretty-pack-scripts %>
 <% } %>
 <%- include shared/ga %>

public/views/shared/refresh-modal.ejs

@@ -14,7 +14,7 @@
                 </div>
                 <div class="new-version" style="display:none;">
                     <h5><%= __('New version available!') %></h5>
-                    <a href="<%- url %>/s/release-notes" target="_blank" rel="noopener"><%= __('See releases notes here') %></a>
+                    <a href="<%- serverURL %>/s/release-notes" target="_blank" rel="noopener"><%= __('See releases notes here') %></a>
                     <br>
                     <strong><%= __('Refresh to enjoy new features.') %></strong>
                 </div>

public/views/shared/signin-modal.ejs

@@ -8,56 +8,56 @@
                 <h4 class="modal-title" id="mySmallModalLabel"><%= __('Choose method') %></h4>
             </div>
             <div class="modal-body" style="text-align: center;">
-                <% if(facebook) { %>
+                <% if (authProviders.facebook) { %>
-                <a href="<%- url %>/auth/facebook" class="btn btn-lg btn-block btn-social btn-facebook">
+                <a href="<%- serverURL %>/auth/facebook" class="btn btn-lg btn-block btn-social btn-facebook">
                     <i class="fa fa-facebook"></i> <%= __('Sign in via %s', 'Facebook') %>
                 </a>
                 <% } %>
-                <% if(twitter) { %>
+                <% if (authProviders.twitter) { %>
-                <a href="<%- url %>/auth/twitter" class="btn btn-lg btn-block btn-social btn-twitter">
+                <a href="<%- serverURL %>/auth/twitter" class="btn btn-lg btn-block btn-social btn-twitter">
                     <i class="fa fa-twitter"></i> <%= __('Sign in via %s', 'Twitter') %>
                 </a>
                 <% } %>
-                <% if(github) { %>
+                <% if (authProviders.github) { %>
-                <a href="<%- url %>/auth/github" class="btn btn-lg btn-block btn-social btn-github">
+                <a href="<%- serverURL %>/auth/github" class="btn btn-lg btn-block btn-social btn-github">
                     <i class="fa fa-github"></i> <%= __('Sign in via %s', 'GitHub') %>
                 </a>
                 <% } %>
-                <% if(gitlab) { %>
+                <% if (authProviders.gitlab) { %>
-                <a href="<%- url %>/auth/gitlab" class="btn btn-lg btn-block btn-social btn-soundcloud">
+                <a href="<%- serverURL %>/auth/gitlab" class="btn btn-lg btn-block btn-social btn-soundcloud">
                     <i class="fa fa-gitlab"></i> <%= __('Sign in via %s', 'GitLab') %>
                 </a>
                 <% } %>
-                <% if(mattermost) { %>
+                <% if (authProviders.mattermost) { %>
-                <a href="<%- url %>/auth/mattermost" class="btn btn-lg btn-block btn-social btn-soundcloud">
+                <a href="<%- serverURL %>/auth/mattermost" class="btn btn-lg btn-block btn-social btn-soundcloud">
                     <i class="fa fa-mattermost"></i> <%= __('Sign in via %s', 'Mattermost') %>
                 </a>
                 <% } %>
-                <% if(dropbox) { %>
+                <% if (authProviders.dropbox) { %>
-                <a href="<%- url %>/auth/dropbox" class="btn btn-lg btn-block btn-social btn-dropbox">
+                <a href="<%- serverURL %>/auth/dropbox" class="btn btn-lg btn-block btn-social btn-dropbox">
                     <i class="fa fa-dropbox"></i> <%= __('Sign in via %s', 'Dropbox') %>
                 </a>
                 <% } %>
-                <% if(google) { %>
+                <% if (authProviders.google) { %>
-                <a href="<%- url %>/auth/google" class="btn btn-lg btn-block btn-social btn-google">
+                <a href="<%- serverURL %>/auth/google" class="btn btn-lg btn-block btn-social btn-google">
                     <i class="fa fa-google"></i> <%= __('Sign in via %s', 'Google') %>
                 </a>
                 <% } %>
-                <% if(saml) { %>
+                <% if (authProviders.saml) { %>
-                <a href="<%- url %>/auth/saml" class="btn btn-lg btn-block btn-social btn-success">
+                <a href="<%- serverURL %>/auth/saml" class="btn btn-lg btn-block btn-social btn-success">
                     <i class="fa fa-users"></i> <%= __('Sign in via %s', 'SAML') %>
                 </a>
                 <% } %>
-                <% if(oauth2) { %>
+                <% if (authProviders.oauth2) { %>
-                <a href="<%- url %>/auth/oauth2" class="btn btn-lg btn-block btn-social btn-soundcloud">
+                <a href="<%- serverURL %>/auth/oauth2" class="btn btn-lg btn-block btn-social btn-soundcloud">
-                    <i class="fa fa-mail-forward"></i> <%= __('Sign in via %s', oauth2ProviderName || 'OAuth2') %>
+                    <i class="fa fa-mail-forward"></i> <%= __('Sign in via %s', authProviders.oauth2ProviderName || 'OAuth2') %>
                 </a>
                 <% } %>
-                <% 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) { %>
                 <hr>
                 <% }%>
-                <% if(ldap) { %>
+                <% if (authProviders.ldap) { %>
-                <h4>Via <% if (ldapProviderName) { %> <%= ldapProviderName %> (LDAP) <% } else { %> LDAP <% } %></h4>
+                <h4>Via <% if (authProviders.ldapProviderName) { %> <%= authProviders.ldapProviderName %> (LDAP) <% } else { %> LDAP <% } %></h4>
                 <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
                     <div class="form-group">
                         <div class="col-sm-12">
@@ -73,15 +73,15 @@
                     </div>
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button type="submit" class="btn btn-primary" formaction="<%- url %>/auth/ldap">Sign in</button>
+                            <button type="submit" class="btn btn-primary" formaction="<%- serverURL %>/auth/ldap">Sign in</button>
                         </div>
                     </div>
                 </form>
                 <% } %>
-                <% 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) { %>
                 <hr>
                 <% }%>
-                <% if(openID) { %>
+                <% if (authProviders.openID) { %>
                 <h4>OpenID</h4>
                 <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
                     <div class="form-group">
@@ -92,15 +92,15 @@
                     </div>
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button type="submit" class="btn btn-primary" formaction="<%- url %>/auth/openid">Sign in</button>
+                            <button type="submit" class="btn btn-primary" formaction="<%- serverURL %>/auth/openid">Sign in</button>
                         </div>
                     </div>
                 </form>
                 <% } %>
-                <% 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) { %>
                 <hr>
                 <% }%>
-                <% if(email) { %>
+                <% if (authProviders.email) { %>
                 <h4>Via Email</h4>
                 <form data-toggle="validator" role="form" class="form-horizontal" method="post" enctype="application/x-www-form-urlencoded">
                     <div class="form-group">
@@ -117,8 +117,8 @@
                     </div>
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button type="submit" class="btn btn-primary" formaction="<%- url %>/login">Sign in</button>
+                            <button type="submit" class="btn btn-primary" formaction="<%- serverURL %>/login">Sign in</button>
-                            <% if(allowEmailRegister) { %><button type="submit" class="btn btn-default" formaction="<%- url %>/register">Register</button><% }%>
+                            <% if (authProviders.allowEmailRegister) { %><button type="submit" class="btn btn-default" formaction="<%- serverURL %>/register">Register</button><% }%>
                         </div>
                     </div>
                 </form>

public/views/slide.ejs

@@ -12,8 +12,8 @@
         <meta name="description" content="<%= description %>">
         <% } %>
         <title><%= title %></title>
-        <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
+        <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
-        <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
+        <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 
         <% if(useCDN) { %>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fork-awesome/1.1.3/css/fork-awesome.min.css" integrity="sha256-ZhApazu+kejqTYhMF+1DzNKjIzP7KXu6AzyXcC1gMus=" crossorigin="anonymous" />
@@ -23,28 +23,28 @@
         <%- include build/slide-header %>
         <%- include shared/polyfill %>
         <% } else { %>
-        <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/reveal.css">
+        <link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/css/reveal.css">
-        <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
+        <link rel="stylesheet" href='<%- serverURL %>/build/emojify.js/dist/css/basic/emojify.min.css'>
         <%- include build/slide-pack-header %>
         <% } %>
 
         <!-- For reveal.js theme -->
         <% if(typeof theme !== 'undefined' && theme) { %>
-        <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/theme/<%= theme %>.css" id="theme">
+        <link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/css/theme/<%= theme %>.css" id="theme">
         <% } else { %>
-        <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/theme/black.css" id="theme">
+        <link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/css/theme/black.css" id="theme">
         <% } %>
         <!-- For syntax highlighting -->
-        <link rel="stylesheet" href="<%- url %>/build/reveal.js/lib/css/zenburn.css">
+        <link rel="stylesheet" href="<%- serverURL %>/build/reveal.js/lib/css/zenburn.css">
         <!-- For overwrite reveal.js -->
-        <link rel="stylesheet" href="<%- url %>/css/slide.css">
+        <link rel="stylesheet" href="<%- serverURL %>/css/slide.css">
 
         <!-- Printing and PDF exports -->
         <script nonce="<%= cspNonce %>">
             var link = document.createElement( 'link' );
             link.rel = 'stylesheet';
             link.type = 'text/css';
-            link.href = '<%- url %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css');
+            link.href = '<%- serverURL %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css');
             document.getElementsByTagName( 'head' )[0].appendChild( link );
         </script>
     </head>
@@ -86,7 +86,7 @@
             </div>
         </div>
 
-        <script src="<%= url %>/js/mathjax-config-extra.js"></script>
+        <script src="<%= serverURL %>/js/mathjax-config-extra.js"></script>
         <% if(useCDN) { %>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0/lib/js/head.min.js" integrity="sha256-+09kLhwACKXFPDvqo4xMMvi4+uXFsRZ2uYGbeN1U8sI=" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0/js/reveal.min.js" integrity="sha256-ixSKHrWAL2k0mqVSRju9+to2/uZSEK9+kJRfdNBolG8=" crossorigin="anonymous"></script>
@@ -106,8 +106,8 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
         <%- include build/slide-scripts %>
         <% } else { %>
-        <script src="<%- url %>/build/MathJax/MathJax.js" defer></script>
+        <script src="<%- serverURL %>/build/MathJax/MathJax.js" defer></script>
-        <script src="<%- url %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
+        <script src="<%- serverURL %>/build/MathJax/config/TeX-AMS-MML_HTMLorMML.js" defer></script>
         <%- include build/slide-pack-scripts %>
         <% } %>
     </body>