Merge branch 'dev' into 'dev'

Cleanup and Jquery update

See merge request Shinobi-Systems/Shinobi!376
upgrade-sftp-uploader
Moe 2022-08-08 03:50:43 +00:00
commit cb31a0ee61
11 changed files with 11 additions and 3977 deletions

View File

@ -14,7 +14,7 @@ module.exports = function(s,config,lang,app,io){
if(!config.logoLocation196x196)config.logoLocation196x196 = 'libs/img/icon/favicon-196x196.png';
if(config.logoLocation76x76Link === undefined){config.logoLocation76x76Link='https://shinobi.video'}
if(config.logoLocation76x76Style === undefined){config.logoLocation76x76Style='border-radius:50%'}
if(config.loginScreenBackground === undefined){config.loginScreenBackground='https://shinobi.video/libs/assets/backgrounds/7.jpg'}
if(config.loginScreenBackground === undefined){config.loginScreenBackground='assets/img/splash.avif'}
if(config.showLoginSelector === undefined){config.showLoginSelector=true}
if(config.defaultTheme === undefined)config.defaultTheme = 'Ice-v3';
if(config.socialLinks === undefined){

BIN
web/assets/img/splash.avif Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
<% var pageTitle = lang.Shinobi %>
<!-- Header -->
<% include blocks/header.ejs %>
<% include blocks/header-loggedIn.ejs %>
<!-- Page -->

View File

@ -1,3 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Powered by Shinobi, http://shinobi.video -->
<% include blocks/header-title.ejs %>
@ -27,6 +29,7 @@
return string.replace(/'/g,"\\'")
}%>
<% if(screen){screen=screen.toLowerCase()} %>
<body>
<div id="page-contents" class="display-table full-height">
<div class="shinobi-bg-shade bg-gradient-<%- screen === 'super' ? 'green' : 'blue' %>">
<div class="d-flex flex-row full-height">
@ -176,6 +179,7 @@
</div>
</div>
</div>
</body>
<script>
var googleSignIn = false;
<% var failedLogin;if(failedLogin===true){ %>
@ -202,3 +206,4 @@
}
</script>
<% } %>
</html>